0054504: Exception when accessing VTK renderer with libSalomePy module

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

diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index 8bc0f1c58a69225d7a82b1560551f4fa7f981e26..c3405a8caead7d71ad11f7da3e3d53d6b7149fa6 100644 (file)
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef QDS_COMBOBOX_H
 #define QDS_COMBOBOX_H
 
@@ -61,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;
@@ -78,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& );