Commit da097bd9 authored by Martin Schultz's avatar Martin Schultz

Merge branch 'master' into featureQt5.6Support

parents 28b0bba6 8f913ee4
Pipeline #1767 passed with stage
......@@ -143,7 +143,7 @@ class DLLEXPORT BSplineCurveObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/// Update the whole Object (Selection,Topology,...)
virtual void update(UpdateType _type = UPDATE_ALL);
......
......@@ -144,7 +144,7 @@ class DLLEXPORT BSplineSurfaceObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/// Update the whole Object (Selection,Topology,...)
virtual void update(UpdateType _type = UPDATE_ALL);
......
......@@ -185,7 +185,7 @@ class DLLEXPORT CameraObject : public BaseObjectData {
*
* @{ */
//===========================================================================
private:
protected:
/// Update the whole Object (Selection,Topology,...)
virtual void update(UpdateType _type = UPDATE_ALL);
......
......@@ -165,7 +165,7 @@ class DLLEXPORT CoordsysObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/// Update the whole Object (Selection,Topology,...)
virtual void update(UpdateType _type = UPDATE_ALL);
......
......@@ -150,7 +150,7 @@ class DLLEXPORT LightObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/** \brief Update the Light Object
*
* Updates the rendering of the light object
......
......@@ -167,7 +167,7 @@ class DLLEXPORTONLY MeshObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/// Update the whole Object (Selection,Topology,...)
virtual void update(UpdateType _type = UPDATE_ALL);
......
......@@ -137,7 +137,7 @@ class DLLEXPORT PlaneObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. This function
......
......@@ -147,7 +147,7 @@ class DLLEXPORT PolyLineObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. Normally this will update
......
......@@ -198,7 +198,7 @@ class DLLEXPORT QtWidgetObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. This function
......
......@@ -182,7 +182,7 @@ class DLLEXPORT SkeletonObject : public BaseObjectData {
* @{ */
//===========================================================================
private:
protected:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. This function
......
......@@ -166,7 +166,7 @@ class DLLEXPORT SphereObject : public BaseObjectData {
*
* @{ */
//===========================================================================
private:
protected:
/// Update the whole Object (Selection,Topology,...)
virtual void update(UpdateType _type = UPDATE_ALL);
......
......@@ -138,7 +138,7 @@ protected:
*
* @{ */
//===========================================================================
private:
protected:
/// Called by the core if the object has to be updated
void update( UpdateType _type = UPDATE_ALL );
......
......@@ -165,7 +165,7 @@ public:
*
* @{ */
//===========================================================================
private:
protected:
/// Update the whole Object (Selection,Topology,...)
virtual void update(UpdateType _type = UPDATE_ALL);
......
......@@ -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();
/** @} */
......
......@@ -289,7 +289,7 @@ class DLLEXPORT BaseObjectData : public BaseObject
* @{ */
//===========================================================================
private:
protected:
/** \brief This function is called to update the object
*
* If the object changes, the core will call this function. Normally this will update
......
......@@ -78,4 +78,4 @@ find_package_handle_standard_args(CLP DEFAULT_MSG
mark_as_advanced(CLP_INCLUDE_DIR CLP_LIBRARY)
endif(CLP_FOUND)
endif( NOT CLP_FOUND)
Subproject commit 0837d5d1d05050a8fe42461c492c43244fecbb96
Subproject commit d71fc18d6a660191ec6358f8861fc0874a13d264
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment