Merge from V6_main 11/02/2013

[modules/gui.git] / src / QDS / QDS_ComboBox.h

diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index 31a45aee6d4eb9a5248c93213efe50f028c53141..e704b2e3d03a508371a29c386788ce29376be845 100644 (file)
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -62,6 +62,8 @@ public:
   void                       setValues( const QList<int>&, const QStringList& );
   void                       setValues( const QStringList& );
 
+  virtual QString            getString() const;
+
   virtual void               reset();
 
   int                        stringToValue( const QString& ) const;
@@ -79,7 +81,6 @@ protected:
   QtxComboBox*               comboBox() const;
   virtual QWidget*           createControl( QWidget* );
 
-  virtual QString            getString() const;
   virtual void               setString( const QString& );
 
   virtual void               unitSystemChanged( const QString& );