introduction of penta18 in VTK viewer

[modules/gui.git] / src / Qtx / QtxComboBox.h

diff --git a/src/Qtx/QtxComboBox.h b/src/Qtx/QtxComboBox.h
index 345881b325350650496d3f2556808cd5568aa3be..52f1595420dda8868d4d3753b437ed5920e20170 100755 (executable)
--- a/src/Qtx/QtxComboBox.h
+++ b/src/Qtx/QtxComboBox.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
 //
+
 // File:      QtxComboBox.h
 // Author:    Sergey TELKOV
 //
@@ -48,20 +49,21 @@ public:
   bool         isCleared() const;
   void         setCleared( const bool );
 
-  int          currentId() const;
-  void         setCurrentId( int );
+  QVariant     currentId() const;
+  void         setCurrentId( const QVariant& );
 
-  int          id( const int ) const;
-  int          index( const int ) const;
+  QVariant     id( const int ) const;
+  int          index( const QVariant& ) const;
 
   bool         hasId( const int ) const;
-  void         setId( const int, const int );
+  void         setId( const int, const QVariant& );
 
 signals:
+  void         activatedId( QVariant );
   void         activatedId( int );
+  void         activatedId( QString );
 
 private slots:
-  void         onActivated( int );
   void         onCurrentChanged( int );
 
 protected: