Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/cgt/devCEA'
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetShapeSelector.h
diff --git
a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index 35ce69e16362d6b2dd60216a2062cebc8892ffed..6ac087fbb9530e0e66900111674517323609cb7a 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetShapeSelector.h
+++ b/
src/ModuleBase/ModuleBase_WidgetShapeSelector.h
@@
-10,7
+10,6
@@
#include "ModuleBase.h"
#include "ModuleBase_WidgetSelector.h"
#include "ModuleBase_ViewerFilters.h"
#include "ModuleBase.h"
#include "ModuleBase_WidgetSelector.h"
#include "ModuleBase_ViewerFilters.h"
-#include <ModuleBase_ViewerPrs.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Attribute.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Attribute.h>
@@
-26,6
+25,7
@@
class QLabel;
class QLineEdit;
class QToolButton;
class ModuleBase_IWorkshop;
class QLineEdit;
class QToolButton;
class ModuleBase_IWorkshop;
+class ModuleBase_ViewerPrs;
class ModelAPI_Validator;
/**
class ModelAPI_Validator;
/**
@@
-84,7
+84,7
@@
Q_OBJECT
protected:
/// Saves the internal parameters to the given feature
/// \return True in success
protected:
/// Saves the internal parameters to the given feature
/// \return True in success
- virtual bool storeValueCustom()
const
;
+ virtual bool storeValueCustom();
virtual bool restoreValueCustom();
virtual bool restoreValueCustom();
@@
-96,7
+96,7
@@
Q_OBJECT
/// Retunrs a list of possible shape types
/// \return a list of shapes
/// Retunrs a list of possible shape types
/// \return a list of shapes
- virtual QIntList
getS
hapeTypes() const;
+ virtual QIntList
s
hapeTypes() const;
/// Get the shape from the attribute if the attribute contains a shape, e.g. selection attribute
/// \return a shape
/// Get the shape from the attribute if the attribute contains a shape, e.g. selection attribute
/// \return a shape