Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
cdcc0dbc
Commit
cdcc0dbc
authored
May 10, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made the update function protected instead of private. Forgot the hierarchy
parent
80f89fb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
common/BaseObject.hh
common/BaseObject.hh
+15
-6
common/BaseObjectData.hh
common/BaseObjectData.hh
+1
-1
No files found.
common/BaseObject.hh
View file @
cdcc0dbc
...
...
@@ -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 @
cdcc0dbc
...
...
@@ -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
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