Gui: modernize C++11
* remove redundant void-arg * use nullptr
This commit is contained in:
@@ -56,7 +56,7 @@ SoFCColorBarBase::~SoFCColorBarBase()
|
||||
}
|
||||
|
||||
// doc from parent
|
||||
void SoFCColorBarBase::initClass(void)
|
||||
void SoFCColorBarBase::initClass()
|
||||
{
|
||||
SO_NODE_INIT_ABSTRACT_CLASS(SoFCColorBarBase,SoSeparator,"Separator");
|
||||
}
|
||||
@@ -85,7 +85,7 @@ class SoFCColorBarProxyObject : public QObject
|
||||
{
|
||||
public:
|
||||
SoFCColorBarProxyObject(SoFCColorBar* b)
|
||||
: QObject(0), bar(b) {}
|
||||
: QObject(nullptr), bar(b) {}
|
||||
~SoFCColorBarProxyObject() {}
|
||||
void customEvent(QEvent *)
|
||||
{
|
||||
@@ -137,7 +137,7 @@ SoFCColorBar::~SoFCColorBar()
|
||||
}
|
||||
|
||||
// doc from parent
|
||||
void SoFCColorBar::initClass(void)
|
||||
void SoFCColorBar::initClass()
|
||||
{
|
||||
SO_NODE_INIT_CLASS(SoFCColorBar,SoFCColorBarBase,"Separator");
|
||||
}
|
||||
@@ -186,12 +186,12 @@ bool SoFCColorBar::isVisible (float fVal) const
|
||||
return this->getActiveBar()->isVisible(fVal);
|
||||
}
|
||||
|
||||
float SoFCColorBar::getMinValue (void) const
|
||||
float SoFCColorBar::getMinValue () const
|
||||
{
|
||||
return this->getActiveBar()->getMinValue();
|
||||
}
|
||||
|
||||
float SoFCColorBar::getMaxValue (void) const
|
||||
float SoFCColorBar::getMaxValue () const
|
||||
{
|
||||
return this->getActiveBar()->getMaxValue();
|
||||
}
|
||||
|
||||
@@ -50,8 +50,8 @@ class GuiExport SoFCColorBarBase : public SoSeparator, public App::ValueFloatToR
|
||||
SO_NODE_ABSTRACT_HEADER(Gui::SoFCColorBarBase);
|
||||
|
||||
public:
|
||||
static void initClass(void);
|
||||
static void finish(void);
|
||||
static void initClass();
|
||||
static void finish();
|
||||
|
||||
virtual void GLRenderBelowPath ( SoGLRenderAction *action );
|
||||
|
||||
@@ -86,12 +86,12 @@ public:
|
||||
*
|
||||
* This method must be implemented in subclasses.
|
||||
*/
|
||||
virtual float getMinValue (void) const = 0;
|
||||
virtual float getMinValue () const = 0;
|
||||
/** Returns the current maximum of the parameter range.
|
||||
*
|
||||
* This method must be implemented in subclasses.
|
||||
*/
|
||||
virtual float getMaxValue (void) const = 0;
|
||||
virtual float getMaxValue () const = 0;
|
||||
/**
|
||||
* Opens a dialog to customize the current settings of the color bar.
|
||||
* Returns true if the settings have been changed, false otherwise.
|
||||
@@ -113,7 +113,7 @@ protected:
|
||||
*/
|
||||
virtual void setViewportSize( const SbVec2s& size ) = 0;
|
||||
|
||||
SoFCColorBarBase (void);
|
||||
SoFCColorBarBase ();
|
||||
virtual ~SoFCColorBarBase ();
|
||||
|
||||
private:
|
||||
@@ -132,9 +132,9 @@ class GuiExport SoFCColorBar : public SoFCColorBarBase, public Base::Subject<int
|
||||
SO_NODE_HEADER(Gui::SoFCColorBar);
|
||||
|
||||
public:
|
||||
static void initClass(void);
|
||||
static void finish(void);
|
||||
SoFCColorBar(void);
|
||||
static void initClass();
|
||||
static void finish();
|
||||
SoFCColorBar();
|
||||
|
||||
/**
|
||||
* Returns the currently active color bar object.
|
||||
@@ -164,11 +164,11 @@ public:
|
||||
/**
|
||||
* Returns the current minimum of the parameter range of the currently active color bar.
|
||||
*/
|
||||
float getMinValue (void) const;
|
||||
float getMinValue () const;
|
||||
/**
|
||||
* Returns the current maximum of the parameter range of the currently active color bar.
|
||||
*/
|
||||
float getMaxValue (void) const;
|
||||
float getMaxValue () const;
|
||||
/**
|
||||
* Customizes the currently active color bar.
|
||||
*/
|
||||
|
||||
@@ -72,7 +72,7 @@ SoFCColorGradient::~SoFCColorGradient()
|
||||
}
|
||||
|
||||
// doc from parent
|
||||
void SoFCColorGradient::initClass(void)
|
||||
void SoFCColorGradient::initClass()
|
||||
{
|
||||
SO_NODE_INIT_CLASS(SoFCColorGradient,SoFCColorBarBase,"Separator");
|
||||
}
|
||||
|
||||
@@ -42,9 +42,9 @@ class GuiExport SoFCColorGradient : public SoFCColorBarBase {
|
||||
SO_NODE_HEADER(Gui::SoFCColorGradient);
|
||||
|
||||
public:
|
||||
static void initClass(void);
|
||||
static void finish(void);
|
||||
SoFCColorGradient(void);
|
||||
static void initClass();
|
||||
static void finish();
|
||||
SoFCColorGradient();
|
||||
|
||||
/**
|
||||
* Sets the range of the colorbar from the maximum \a fMax to the minimum \a fMin.
|
||||
@@ -63,9 +63,9 @@ public:
|
||||
*/
|
||||
bool isVisible (float fVal) const;
|
||||
/** Returns the current minimum of the parameter range. */
|
||||
float getMinValue (void) const { return _cColGrad.getMinValue(); }
|
||||
float getMinValue () const { return _cColGrad.getMinValue(); }
|
||||
/** Returns the current maximum of the parameter range. */
|
||||
float getMaxValue (void) const { return _cColGrad.getMaxValue(); }
|
||||
float getMaxValue () const { return _cColGrad.getMaxValue(); }
|
||||
/**
|
||||
* Opens a dialog to customize the current settings of the color gradient bar.
|
||||
* Returns true if the settings have been changed, false otherwise.
|
||||
|
||||
@@ -73,7 +73,7 @@ SoFCColorLegend::~SoFCColorLegend()
|
||||
}
|
||||
|
||||
// doc from parent
|
||||
void SoFCColorLegend::initClass(void)
|
||||
void SoFCColorLegend::initClass()
|
||||
{
|
||||
SO_NODE_INIT_CLASS(SoFCColorLegend,SoFCColorBarBase,"Separator");
|
||||
}
|
||||
|
||||
@@ -41,9 +41,9 @@ class GuiExport SoFCColorLegend : public SoFCColorBarBase {
|
||||
SO_NODE_HEADER(Gui::SoFCColorLegend);
|
||||
|
||||
public:
|
||||
static void initClass(void);
|
||||
static void finish(void);
|
||||
SoFCColorLegend(void);
|
||||
static void initClass();
|
||||
static void finish();
|
||||
SoFCColorLegend();
|
||||
|
||||
void setLegendLabels(const App::ColorLegend& legend, int prec=3);
|
||||
|
||||
@@ -61,9 +61,9 @@ public:
|
||||
App::Color getColor (float fVal) const { return _currentLegend.getColor(fVal); }
|
||||
void setOutsideGrayed (bool bVal) { _currentLegend.setOutsideGrayed(bVal); }
|
||||
bool isVisible (float) const { return false; }
|
||||
float getMinValue (void) const { return _currentLegend.getMinValue(); }
|
||||
float getMaxValue (void) const { return _currentLegend.getMaxValue(); }
|
||||
std::size_t countColors (void) const { return _currentLegend.hasNumberOfFields(); }
|
||||
float getMinValue () const { return _currentLegend.getMinValue(); }
|
||||
float getMaxValue () const { return _currentLegend.getMaxValue(); }
|
||||
std::size_t countColors () const { return _currentLegend.hasNumberOfFields(); }
|
||||
|
||||
bool customize() { return false; }
|
||||
const char* getColorBarName() const { return "Color Legend"; }
|
||||
|
||||
Reference in New Issue
Block a user