Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / ModuleBase / ModuleBase_ParamSpinBox.h

diff --git a/src/ModuleBase/ModuleBase_ParamSpinBox.h b/src/ModuleBase/ModuleBase_ParamSpinBox.h
index 5945dcbd84250337d40c7bbf99da9105ddfac857..8d9811db054de42f0c70aea73fa73725c418cf73 100644 (file)
--- a/src/ModuleBase/ModuleBase_ParamSpinBox.h
+++ b/src/ModuleBase/ModuleBase_ParamSpinBox.h
@@ -21,27 +21,24 @@ public:
   virtual void stepBy(int);
 
   virtual double valueFromText(const QString&) const;
-  virtual QString textFromValue(double) const;
 
   virtual QValidator::State validate(QString&, int&) const;
 
-  virtual void setDefaultValue(const double);
-
   virtual void setValue(double);
 
   virtual void setText(const QString&);
 
   void setAcceptVariables(const bool);
   bool isAcceptVariables() const;
-  bool hasVariables() const;
+  bool hasVariable() const;
 
 signals:
   void textChanged(const QString&);
 
  protected:
+  bool hasVariable(const QString& theText) const;
   State isValid(const QString&, double&) const;
 
-  double defaultValue() const;
   bool checkRange(const double) const;
 
   bool findVariable(const QString&, double&) const;
@@ -58,13 +55,10 @@ signals:
   void connectSignalsAndSlots();
 
  private:
-  double myDefaultValue;
-
   QString myCorrectValue;
   QString myTextValue;
 
   bool myAcceptVariables;
-  bool myHasVariables;
 };
 
 #endif