From c92f962f3935418e8f6dcdcc919d25415f4711c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Mon, 15 Oct 2007 21:09:03 +0000 Subject: [PATCH] qt4 preferences: the label is not mandatory in object constructor --- .../qt4/components/preferences_widgets.hpp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp index 4bb91ec6f6..b63ff9343f 100644 --- a/modules/gui/qt4/components/preferences_widgets.hpp +++ b/modules/gui/qt4/components/preferences_widgets.hpp @@ -117,8 +117,8 @@ public: QLabel*, QSlider* ); virtual ~IntegerConfigControl() {}; virtual int getValue(); - virtual void show() { spin->show(); label->show(); } - virtual void hide() { spin->hide(); label->hide(); } + virtual void show() { spin->show(); if( label ) label->show(); } + virtual void hide() { spin->hide(); if( label ) label->hide(); } protected: QSpinBox *spin; @@ -161,8 +161,8 @@ public: QComboBox*, bool ); virtual ~IntegerListConfigControl() {}; virtual int getValue(); - virtual void hide() { combo->hide(); label->hide(); } - virtual void show() { combo->show(); label->show(); } + virtual void hide() { combo->hide(); if( label ) label->hide(); } + virtual void show() { combo->show(); if( label ) label->show(); } private: void finish( bool ); QLabel *label; @@ -211,8 +211,8 @@ public: QLabel*, QDoubleSpinBox* ); virtual ~FloatConfigControl() {}; virtual float getValue(); - virtual void show() { spin->show(); label->show(); } - virtual void hide() { spin->hide(); label->hide(); } + virtual void show() { spin->show(); if( label ) label->show(); } + virtual void hide() { spin->hide(); if( label ) label->hide(); } protected: QDoubleSpinBox *spin; @@ -260,8 +260,8 @@ public: QLineEdit*, bool pwd ); virtual ~StringConfigControl() {}; virtual QString getValue() { return text->text(); }; - virtual void show() { text->show(); label->show(); } - virtual void hide() { text->hide(); label->hide(); } + virtual void show() { text->show(); if( label ) label->show(); } + virtual void hide() { text->hide(); if( label ) label->hide(); } private: void finish(); QLineEdit *text; @@ -278,8 +278,8 @@ public: QLineEdit *, QPushButton *, bool pwd ); virtual ~FileConfigControl() {}; virtual QString getValue() { return text->text(); }; - virtual void show() { text->show(); label->show(); browse->show(); } - virtual void hide() { text->hide(); label->hide(); browse->hide(); } + virtual void show() { text->show(); if( label ) label->show(); browse->show(); } + virtual void hide() { text->hide(); if( label ) label->hide(); browse->hide(); } public slots: virtual void updateField(); protected: @@ -324,8 +324,8 @@ public: QComboBox*, bool ); virtual ~ModuleConfigControl() {}; virtual QString getValue(); - virtual void hide() { combo->hide(); label->hide(); } - virtual void show() { combo->show(); label->show(); } + virtual void hide() { combo->hide(); if( label ) label->hide(); } + virtual void show() { combo->show(); if( label ) label->show(); } private: void finish( bool ); QLabel *label; @@ -367,8 +367,8 @@ public: QComboBox*, bool ); virtual ~StringListConfigControl() {}; virtual QString getValue(); - virtual void hide() { combo->hide(); label->hide(); } - virtual void show() { combo->show(); label->show(); } + virtual void hide() { if( combo ) combo->hide(); if( label ) label->hide(); } + virtual void show() { if( combo ) combo->show(); if( label ) label->show(); } private: void finish( bool ); QLabel *label; @@ -422,8 +422,8 @@ public: QGridLayout*, int& ); virtual int getType() { return 4; } virtual ~KeySelectorControl() {}; - virtual void hide() { table->hide(); label->hide(); } - virtual void show() { table->show(); label->show(); } + virtual void hide() { table->hide(); if( label ) label->hide(); } + virtual void show() { table->show(); if( label ) label->show(); } void doApply(); private: void finish(); -- 2.20.1