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-Free
Commits
35717d48
Commit
35717d48
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
02a94b65
Pipeline
#1678
passed with stage
Changes
15
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
29 additions
and
20 deletions
+29
-20
ObjectTypes/BSplineCurve/BSplineCurveObject.hh
ObjectTypes/BSplineCurve/BSplineCurveObject.hh
+1
-1
ObjectTypes/BSplineSurface/BSplineSurfaceObject.hh
ObjectTypes/BSplineSurface/BSplineSurfaceObject.hh
+1
-1
ObjectTypes/Camera/CameraObject.hh
ObjectTypes/Camera/CameraObject.hh
+1
-1
ObjectTypes/Coordsys/CoordsysObject.hh
ObjectTypes/Coordsys/CoordsysObject.hh
+1
-1
ObjectTypes/Light/LightObject.hh
ObjectTypes/Light/LightObject.hh
+1
-1
ObjectTypes/MeshObject/MeshObjectT.hh
ObjectTypes/MeshObject/MeshObjectT.hh
+1
-1
ObjectTypes/Plane/PlaneObject.hh
ObjectTypes/Plane/PlaneObject.hh
+1
-1
ObjectTypes/PolyLine/PolyLineObject.hh
ObjectTypes/PolyLine/PolyLineObject.hh
+1
-1
ObjectTypes/QtWidget/QtWidgetObject.hh
ObjectTypes/QtWidget/QtWidgetObject.hh
+1
-1
ObjectTypes/Skeleton/SkeletonObject.hh
ObjectTypes/Skeleton/SkeletonObject.hh
+1
-1
ObjectTypes/Sphere/SphereObject.hh
ObjectTypes/Sphere/SphereObject.hh
+1
-1
ObjectTypes/SplatCloud/SplatCloudObject.hh
ObjectTypes/SplatCloud/SplatCloudObject.hh
+1
-1
ObjectTypes/VolumeMeshObject/VolumeMeshObject.hh
ObjectTypes/VolumeMeshObject/VolumeMeshObject.hh
+1
-1
OpenFlipper/common/BaseObject.hh
OpenFlipper/common/BaseObject.hh
+15
-6
OpenFlipper/common/BaseObjectData.hh
OpenFlipper/common/BaseObjectData.hh
+1
-1
No files found.
ObjectTypes/BSplineCurve/BSplineCurveObject.hh
View file @
35717d48
...
...
@@ -143,7 +143,7 @@ class DLLEXPORT BSplineCurveObject : public BaseObjectData {
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/// Update the whole Object (Selection,Topology,...)
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
...
...
ObjectTypes/BSplineSurface/BSplineSurfaceObject.hh
View file @
35717d48
...
...
@@ -144,7 +144,7 @@ class DLLEXPORT BSplineSurfaceObject : public BaseObjectData {
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/// Update the whole Object (Selection,Topology,...)
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
...
...
ObjectTypes/Camera/CameraObject.hh
View file @
35717d48
...
...
@@ -185,7 +185,7 @@ class DLLEXPORT CameraObject : public BaseObjectData {
*
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/// Update the whole Object (Selection,Topology,...)
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
...
...
ObjectTypes/Coordsys/CoordsysObject.hh
View file @
35717d48
...
...
@@ -165,7 +165,7 @@ class DLLEXPORT CoordsysObject : public BaseObjectData {
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/// Update the whole Object (Selection,Topology,...)
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
...
...
ObjectTypes/Light/LightObject.hh
View file @
35717d48
...
...
@@ -150,7 +150,7 @@ class DLLEXPORT LightObject : public BaseObjectData {
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/** \brief Update the Light Object
*
* Updates the rendering of the light object
...
...
ObjectTypes/MeshObject/MeshObjectT.hh
View file @
35717d48
...
...
@@ -167,7 +167,7 @@ class DLLEXPORTONLY MeshObject : public BaseObjectData {
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/// Update the whole Object (Selection,Topology,...)
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
...
...
ObjectTypes/Plane/PlaneObject.hh
View file @
35717d48
...
...
@@ -137,7 +137,7 @@ class DLLEXPORT PlaneObject : public BaseObjectData {
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. This function
...
...
ObjectTypes/PolyLine/PolyLineObject.hh
View file @
35717d48
...
...
@@ -147,7 +147,7 @@ class DLLEXPORT PolyLineObject : public BaseObjectData {
* @{ */
//===========================================================================
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
...
...
ObjectTypes/QtWidget/QtWidgetObject.hh
View file @
35717d48
...
...
@@ -198,7 +198,7 @@ class DLLEXPORT QtWidgetObject : public BaseObjectData {
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. This function
...
...
ObjectTypes/Skeleton/SkeletonObject.hh
View file @
35717d48
...
...
@@ -182,7 +182,7 @@ class DLLEXPORT SkeletonObject : public BaseObjectData {
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. This function
...
...
ObjectTypes/Sphere/SphereObject.hh
View file @
35717d48
...
...
@@ -166,7 +166,7 @@ class DLLEXPORT SphereObject : public BaseObjectData {
*
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/// Update the whole Object (Selection,Topology,...)
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
...
...
ObjectTypes/SplatCloud/SplatCloudObject.hh
View file @
35717d48
...
...
@@ -138,7 +138,7 @@ protected:
*
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/// Called by the core if the object has to be updated
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
...
...
ObjectTypes/VolumeMeshObject/VolumeMeshObject.hh
View file @
35717d48
...
...
@@ -165,7 +165,7 @@ public:
*
* @{ */
//===========================================================================
pr
ivate
:
pr
otected
:
/// Update the whole Object (Selection,Topology,...)
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
...
...
OpenFlipper/common/BaseObject.hh
View file @
35717d48
...
...
@@ -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
();
/** @} */
...
...
OpenFlipper/common/BaseObjectData.hh
View file @
35717d48
...
...
@@ -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