Update from BR_V5_DEV 13Feb2009

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

diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index 2a8791702fac0c0a6fb95e4a528e988ba2a36917..8bc0f1c58a69225d7a82b1560551f4fa7f981e26 100644 (file)
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -1,33 +1,38 @@
-// Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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.
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// 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 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.
 //
-// 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
+//  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.
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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
 //
 #ifndef QDS_COMBOBOX_H
 #define QDS_COMBOBOX_H
 
 #include "QDS_Datum.h"
 
-#include <qmap.h>
-#include <qpixmap.h>
-#include <qstringlist.h>
+#include <QMap>
+#include <QPixmap>
+#include <QStringList>
+
+#include <Qtx.h>
 
-#include <QtxComboBox.h>
+class QtxComboBox;
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
 
@@ -36,14 +41,14 @@ class QDS_EXPORT QDS_ComboBox : public QDS_Datum
   Q_OBJECT
 
 public:
-  QDS_ComboBox( const QString&, QWidget* = 0, const int = All, const QString& = QString::null );
+  QDS_ComboBox( const QString&, QWidget* = 0, const int = All, const QString& = QString() );
   virtual ~QDS_ComboBox();
 
   bool                       editable() const;
   void                       setEditable( const bool );
 
   int                        count( bool = false ) const;
-  void                       values( QValueList<int>&, bool = false ) const;
+  void                       values( QList<int>&, bool = false ) const;
 
   virtual int                integerValue() const;
   virtual double             doubleValue() const;
@@ -52,8 +57,8 @@ public:
 
   bool                       state( const int ) const;
   void                       setState( const bool, const int, const bool = true );
-  void                       setState( const bool, const QValueList<int>&, const bool = true );
-  void                       setValues( const QValueList<int>&, const QStringList& );
+  void                       setState( const bool, const QList<int>&, const bool = true );
+  void                       setValues( const QList<int>&, const QStringList& );
   void                       setValues( const QStringList& );
 
   virtual void               reset();
@@ -103,7 +108,7 @@ private:
   QStringList                myUserNames;
 };
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( default:4251 )
 #endif