X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FQDS%2FQDS.h;h=a1a24140743f0e846d6150839291fcf00baae48e;hb=e70f3c39;hp=6f3fecd85a79ce471daa8b7c692e27e912363078;hpb=f830c97c748d8f8a6a7eccc8e3a58e19066a1181;p=modules%2Fgui.git

diff --git a/src/QDS/QDS.h b/src/QDS/QDS.h
index 6f3fecd85..a1a241407 100644
--- a/src/QDS/QDS.h
+++ b/src/QDS/QDS.h
@@ -1,11 +1,14 @@
-// Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+// 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
 //
 // 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.
+// 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
+// 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.
@@ -16,11 +19,12 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef QDS_H
 #define QDS_H
 
 #ifdef WIN32
-#ifdef QDS_EXPORTS
+#if defined QDS_EXPORTS
 #define QDS_EXPORT __declspec(dllexport)
 #else
 #define QDS_EXPORT __declspec(dllimport)
@@ -34,30 +38,29 @@
 #pragma warning ( disable:4786 )
 #endif
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <QString>
+#include <QList>
 
-#include <TCollection_AsciiString.hxx>
-
-#include <TCollection_ExtendedString.hxx>
+#include <TCollection_HExtendedString.hxx>
+#include <TCollection_HAsciiString.hxx>
 
 class QDS_Datum;
-class Handle(TCollection_HAsciiString);
-class Handle(TCollection_HExtendedString);
+
 
 class QDS_EXPORT QDS
 {
 public:
-   /*! Enum describes bit flags of the Qt datum view and behaviour */
+  //! Enum describes bit flags of the Qt datum view and behaviour
   typedef enum
   {
-    None = 0x00,                   //!< Non specified any flags (Default behaviour)
-    Label = 0x01,                  //!< Create subwidget for datum label
-    Control = 0x02,                //!< Create subwidget for datum input control
-    Units = 0x04,                  //!< Create subwidget for datum units of measure
-    NotFormat = 0x08,              //!< Don't format initial value
-    NotAccel = 0x10,               //!< Not support accelerators in datum label
-    UnitsWithLabel = 0x20,         //!< Display units of measure in label like "<label_text> (<units_text>) instead separate text"
+    None           = 0x00,         //!< Non specified any flags (Default behaviour)
+    Label          = 0x01,         //!< Create subwidget for datum label
+    Control        = 0x02,         //!< Create subwidget for datum input control
+    Units          = 0x04,         //!< Create subwidget for datum units of measure
+    NotFormat      = 0x08,         //!< Don't format initial value
+    NotAccel       = 0x10,         //!< Not support accelerators in datum label
+    NotConvert     = 0x20,         //!< Don't convert numeric value
+    UnitsWithLabel = 0x40,         //!< Display units of measure in label like "<label_text> (<units_text>) instead separate text"
     All = Label | Control | Units  //!< Create all subwidgets
   } DatumFlags;
 
@@ -65,10 +68,10 @@ public:
   static bool                       load( const QString& );
 
   static QString                    unitSystemLabel( const QString&,
-                                                     const QString& = QString::null );
-  static QString                    activeUnitSystem( const QString& = QString::null );
+                                                     const QString& = QString() );
+  static QString                    activeUnitSystem( const QString& = QString() );
   static void                       setActiveUnitSystem( const QString&,
-                                                         const QString& = QString::null );
+                                                         const QString& = QString() );
 
   static QString                    toQString( const TCollection_AsciiString& );
   static QString                    toQString( const TCollection_ExtendedString& );
@@ -87,7 +90,7 @@ protected:
   static void                       removeDatum( QDS_Datum* );
 
 private:
-  static QValueList<QDS_Datum*>     _datumList;
+  static QList<QDS_Datum*>          _datumList;
 };
 
 #endif