Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
4e3ae3c0
Commit
4e3ae3c0
authored
May 12, 2016
by
Martin Schultz
Browse files
Merge branch 'master' into featureQt5.6Support
parents
aefaa713
cdcc0dbc
Changes
2
Hide whitespace changes
Inline
Side-by-side
common/BaseObject.hh
View file @
4e3ae3c0
...
...
@@ -96,6 +96,7 @@ class DLLEXPORTONLY BaseObject : public QObject {
Q_OBJECT
friend
class
BaseObjectData
;
friend
class
Core
;
public
:
...
...
@@ -292,6 +293,20 @@ class DLLEXPORTONLY BaseObject : public QObject {
//===========================================================================
public:
/// Debugging function, writing the subtree to output
void
dumpTree
();
/// Returns a full copy of the object
virtual
BaseObject
*
copy
();
//===========================================================================
/** @name Update handling
* @{ */
//===========================================================================
protected:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. Normally this will update
...
...
@@ -302,12 +317,6 @@ class DLLEXPORTONLY BaseObject : public QObject {
*/
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
/// Debugging function, writing the subtree to output
void
dumpTree
();
/// Returns a full copy of the object
virtual
BaseObject
*
copy
();
/** @} */
...
...
common/BaseObjectData.hh
View file @
4e3ae3c0
...
...
@@ -289,7 +289,7 @@ class DLLEXPORT BaseObjectData : public BaseObject
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. Normally this will update
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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