for compilation under Linux

diff --git a/src/QDS/Makefile.in b/src/QDS/Makefile.in
new file mode 100755 (executable)
index 0000000..97b4ae3
--- /dev/null
+++ b/src/QDS/Makefile.in
@@ -0,0 +1,51 @@
+#  File   : Makefile.in
+#  Author : Alexander SOLOVYOV (OCN)
+#  Module : QDS
+#  $Header: /home/server/cvs/GUI/GUI_SRC/src/QDS/Makefile.in
+
+top_srcdir=@top_srcdir@
+top_builddir=../..
+srcdir=@srcdir@
+VPATH=.:@srcdir@
+
+@COMMENCE@
+
+# header files 
+EXPORT_HEADERS= QDS.h \
+       QDS_CheckBox.h \
+       QDS_ComboBox.h \
+       QDS_Datum.h \
+       QDS_LineEdit.h \
+       QDS_SpinBox.h \
+       QDS_SpinBoxDbl.h \
+       QDS_TextEdit.h \
+       QDS_Validator.h
+                    
+# Libraries targets
+LIB = libQDS.la
+
+LIB_SRC= QDS.cxx \
+       QDS_CheckBox.cxx \
+       QDS_ComboBox.cxx \
+       QDS_Datum.cxx \
+       QDS_LineEdit.cxx \
+       QDS_SpinBox.cxx \
+       QDS_SpinBoxDbl.cxx \
+       QDS_TextEdit.cxx \
+       QDS_Validator.cxx
+ 
+LIB_MOC = QDS_CheckBox.h \
+       QDS_ComboBox.h \
+       QDS_Datum.h \
+       QDS_LineEdit.h \
+       QDS_SpinBox.h \
+       QDS_SpinBoxDbl.h \
+       QDS_TextEdit.h
+
+CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES)
+
+LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) -lDDS -lqtx
+
+@CONCLUDE@
+
+

diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index 62d4e7e49d59236be90e9b2d70518e72fdca2e07..0d2369e1834dbec020926382ecea73e850b65288 100644 (file)
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -755,7 +755,7 @@ Handle(DDS_DicItem) QDS_Datum::dicItem() const
 /*!
   Set the dictionary item in to the datum.
 */
-void QDS_Datum::setDicItem( Handle(DDS_DicItem)& item )
+void QDS_Datum::setDicItem( const Handle(DDS_DicItem)& item )
 {
   myDicItem = item;
 }
@@ -982,7 +982,7 @@ QString QDS_Datum::format( const int num, const QString& id, const bool convert
       aType = anItem->GetType();
       aFormat = toQString( anItem->GetFormat( false ) );
       if ( convert )
-        aNum = anItem->FromSI( aNum );
+        aNum = ( int )anItem->FromSI( aNum );
     }
   }
 

diff --git a/src/QDS/QDS_Datum.h b/src/QDS/QDS_Datum.h
index 5158c2dfb87eec50e7e0390c30dedee3fe0feebc..be0247441c95dee078e45be9e440c9c48bcfbb7a 100644 (file)
--- a/src/QDS/QDS_Datum.h
+++ b/src/QDS/QDS_Datum.h
@@ -107,7 +107,7 @@ protected:
   QWidget*                  controlWidget() const;
 
   Handle(DDS_DicItem)       dicItem() const;
-  void                      setDicItem( Handle(DDS_DicItem)& );
+  void                      setDicItem( const Handle(DDS_DicItem)& );
 
   int                       flags() const;