Errors of Linux compilation was fixed

diff --git a/src/DDS/DDS_DicGroup.cxx b/src/DDS/DDS_DicGroup.cxx
index 56197a523ef7287e5b20ad17b4a6786854a892fe..8f2312cc07c04c6c6caf77d25d2f4da6b698a409 100644 (file)
--- a/src/DDS/DDS_DicGroup.cxx
+++ b/src/DDS/DDS_DicGroup.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>
 
+#include <stdio.h>
+
 IMPLEMENT_STANDARD_HANDLE(DDS_DicGroup, MMgt_TShared)
 IMPLEMENT_STANDARD_RTTIEXT(DDS_DicGroup, MMgt_TShared)
 

diff --git a/src/DDS/DDS_DicItem.cxx b/src/DDS/DDS_DicItem.cxx
index 02cdefb9371abffec57ce051ac95f8788ed9ddeb..7adf34aafc81a3b8f657d362ecbabc361861ef68 100644 (file)
--- a/src/DDS/DDS_DicItem.cxx
+++ b/src/DDS/DDS_DicItem.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_MapOfReal.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 
+#include <stdio.h>
+
 IMPLEMENT_STANDARD_HANDLE(DDS_DicItem, MMgt_TShared)
 IMPLEMENT_STANDARD_RTTIEXT(DDS_DicItem, MMgt_TShared)
 

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 04c25b2fa21d5be0cf707f05c0e44a44f785806d..483993506eda997b3d147c006bc54960e5c2bf73 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -682,7 +682,7 @@ QString LightApp_Application::defaultModule() const
   modules( aModuleNames, false ); // obtain a complete list of module names for the current configuration
   //! If there's the one and only module --> activate it automatically
   //! TODO: Possible improvement - default module can be taken from preferences
-  return aModuleNames.count() > 1 ? "" : ( aModuleNames.count() ? aModuleNames.first() : "" );
+  return aModuleNames.count() > 1 ? QString( "" ) : ( aModuleNames.count() ? aModuleNames.first() : QString( "" ) );
 }
 
 /*!On new window slot.*/
@@ -2538,7 +2538,7 @@ bool LightApp_Application::event( QEvent* e )
     QCustomEvent* ce = ( QCustomEvent* )e;
     QString* d = ( QString* )ce->data();
     if( SUIT_MessageBox::warn2(0, tr("WRN_WARNING"),
-                          d ? *d : "",
+                          d ? *d : QString( "" ),
                           tr("BUT_OK"), tr("BUT_CANCEL"), 0, 1, 0 )==0 )
        onPreferences();
     if( d )

diff --git a/src/LightApp/LightApp_Dialog.cxx b/src/LightApp/LightApp_Dialog.cxx
index 27219f5f1d8f7a7c7159c3e1d183e47640428986..4d66e83cb8047f766e4bed6ffbaf49c2d0ba9849 100644 (file)
--- a/src/LightApp/LightApp_Dialog.cxx
+++ b/src/LightApp/LightApp_Dialog.cxx
@@ -264,7 +264,7 @@ QWidget* LightApp_Dialog::objectWg( const int theId, const int theWgId ) const
 */
 QString LightApp_Dialog::objectText( const int theId ) const
 {
-  return myObjects.contains( theId ) ? myObjects[ theId ].myEdit->text() : "";
+  return myObjects.contains( theId ) ? myObjects[ theId ].myEdit->text() : QString( "" );
 }
 
 /*!

diff --git a/src/Qtx/QtxListResourceEdit.cxx b/src/Qtx/QtxListResourceEdit.cxx
index a075dc153bbd3bcfd3e3d7d73db7b1bb3d5b4dd4..1afbcb3c1161905fd212699d06f83b3ff8b0d094 100644 (file)
--- a/src/Qtx/QtxListResourceEdit.cxx
+++ b/src/Qtx/QtxListResourceEdit.cxx
@@ -1419,7 +1419,7 @@ void QtxListResourceEdit::FontItem::setSize( const int s )
       cursize = defsize.toInt();
   }
 
-  mySizes->setCurrentText( cursize>0 ? QString( "%1" ).arg( cursize ) : "" );
+  mySizes->setCurrentText( cursize>0 ? QString( "%1" ).arg( cursize ) : QString( "" ) );
 }
 
 /*!

diff --git a/src/Qtx/QtxResourceMgr.h b/src/Qtx/QtxResourceMgr.h
index ff72dd3c2ba1a3a4dd0763f748566a3bd1e24342..449b590878b5386a2871064a91088ced71196ec7 100644 (file)
--- a/src/Qtx/QtxResourceMgr.h
+++ b/src/Qtx/QtxResourceMgr.h
@@ -271,7 +271,7 @@ template <class Key, class Value> class QtxResourceMgr::IMapIterator
 {
 public:
   IMapIterator()                           : myMap( 0 ), myIndex( 0 )                                   { init(); }
-  IMapIterator( const IMap<Key,Value>* m ) : myMap( const_cast< IMap<Key,Value>* >( m ) ), myIndex( 0 ) { init(); }
+  IMapIterator( const QtxResourceMgr::IMap<Key,Value>* m ) : myMap( const_cast< QtxResourceMgr::IMap<Key,Value>* >( m ) ), myIndex( 0 ) { init(); }
   IMapIterator( const IMapIterator& i )    : myMap( i.myMap ), myIndex( i.myIndex )                     { init(); }
 
   bool operator==( const IMapIterator& i ) { return !operator!=( i );                                   }
@@ -291,15 +291,15 @@ public:
   IMapIterator  operator--( int ) { IMapIterator i = *this; myIndex--; init(); return i; }
 
 private:
-  IMapIterator( const IMap<Key,Value>* m, const int index ) : myMap( const_cast< IMap<Key,Value>* >( m ) ), myIndex( index ) { init(); }
+  IMapIterator( const QtxResourceMgr::IMap<Key,Value>* m, const int index ) : myMap( const_cast< QtxResourceMgr::IMap<Key,Value>* >( m ) ), myIndex( index ) { init(); }
   void init() { if ( !myMap || myIndex >= myMap->count() ) myIndex = -1; }
 
 private:
-  IMap<Key,Value>* myMap;
+  QtxResourceMgr::IMap<Key,Value>* myMap;
   int              myIndex;
 
-  friend class IMap<Key, Value>;
-  friend class IMapConstIterator<Key, Value>;
+  friend class QtxResourceMgr::IMap<Key, Value>;
+  friend class QtxResourceMgr::IMapConstIterator<Key, Value>;
 };
 
 /*!
@@ -310,9 +310,9 @@ template <class Key, class Value> class QtxResourceMgr::IMapConstIterator
 {
 public:
   IMapConstIterator()                                    : myMap( 0 ), myIndex( 0 )                                    { init(); }
-  IMapConstIterator( const IMap<Key,Value>* m )          : myMap( const_cast< IMap<Key,Value>* >( m )  ), myIndex( 0 ) { init(); }
+  IMapConstIterator( const QtxResourceMgr::IMap<Key,Value>* m )          : myMap( const_cast< QtxResourceMgr::IMap<Key,Value>* >( m )  ), myIndex( 0 ) { init(); }
   IMapConstIterator( const IMapConstIterator& i )        : myMap( i.myMap ), myIndex( i.myIndex )                      { init(); }
-  IMapConstIterator( const IMapIterator<Key, Value>& i ) : myMap( i.myMap ), myIndex( i.myIndex )                      { init(); }
+  IMapConstIterator( const QtxResourceMgr::IMapIterator<Key, Value>& i ) : myMap( i.myMap ), myIndex( i.myIndex )                      { init(); }
   
   bool operator==( const IMapConstIterator& i ) { return !operator!=( i );                                   }
   bool operator!=( const IMapConstIterator& i ) { return !myMap || myMap != i.myMap || myIndex != i.myIndex; }
@@ -330,14 +330,14 @@ public:
   IMapConstIterator  operator--( int ) { IMapConstIterator i = *this; myIndex--; init(); return i; }
   
 private:
-  IMapConstIterator( const IMap<Key,Value>* m, const int index ): myMap( const_cast< IMap<Key,Value>* >( m ) ), myIndex( index ) { init(); }
+  IMapConstIterator( const QtxResourceMgr::IMap<Key,Value>* m, const int index ): myMap( const_cast< QtxResourceMgr::IMap<Key,Value>* >( m ) ), myIndex( index ) { init(); }
   void init() { if ( !myMap || myIndex >= myMap->count() ) myIndex = -1; }
   
 private:
-  IMap<Key,Value>* myMap;
+  QtxResourceMgr::IMap<Key,Value>* myMap;
   int              myIndex;
   
-  friend class IMap<Key,Value>;
+  friend class QtxResourceMgr::IMap<Key,Value>;
 };
 
 /*!
@@ -347,8 +347,8 @@ private:
 template <class Key, class Value> class QtxResourceMgr::IMap
 {
 public:
-  typedef IMapIterator<Key,Value>      Iterator;
-  typedef IMapConstIterator<Key,Value> ConstIterator;
+  typedef QtxResourceMgr::IMapIterator<Key,Value>      Iterator;
+  typedef QtxResourceMgr::IMapConstIterator<Key,Value> ConstIterator;
 
 public:
   IMap() {}
@@ -443,8 +443,8 @@ private:
   Key             dummyKey;
   Value           dummyValue;
 
-  friend class IMapIterator<Key,Value>;
-  friend class IMapConstIterator<Key,Value>;
+  friend class QtxResourceMgr::IMapIterator<Key,Value>;
+  friend class QtxResourceMgr::IMapConstIterator<Key,Value>;
 };
 
 #endif

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 90690cad7c3b0e0162d3ac58cd78c3b9f5dcf2cb..6c256631950cdafc44567b4c0a5630915954d184 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -496,7 +496,7 @@ bool STD_Application::onSaveAsDoc()
     putInfo( tr( "INF_DOC_SAVING" ) + aName );
     isOk = study->saveDocumentAs( aName );
 
-    putInfo( isOk ? tr( "INF_DOC_SAVED" ).arg( aName ) : "" );
+    putInfo( isOk ? tr( "INF_DOC_SAVED" ).arg( aName ) : QString( "" ) );
 
     QApplication::restoreOverrideCursor();
 

diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx
index 9d2e7e18619cdd04f16bd00d33734716b7b91d20..853c3c823d46e3084f78dd576ec3eae0645620a8 100755 (executable)
--- a/src/SUIT/SUIT_ViewManager.cxx
+++ b/src/SUIT/SUIT_ViewManager.cxx
@@ -321,7 +321,7 @@ void SUIT_ViewManager::closeAllViews()
  */
 QString SUIT_ViewManager::getType() const
 { 
-  return (!myViewModel)? "": myViewModel->getType(); 
+  return (!myViewModel)? QString( "" ): myViewModel->getType(); 
 }
 
 /*!

diff --git a/src/SVTK/SVTK_RectPicker.cxx b/src/SVTK/SVTK_RectPicker.cxx
index bf99c7b619ca0a51db797e9080681c748adce395..20fd3209d11df1353d6ecac41f0841cc0bc6a2fe 100644 (file)
--- a/src/SVTK/SVTK_RectPicker.cxx
+++ b/src/SVTK/SVTK_RectPicker.cxx
@@ -167,19 +167,24 @@ namespace
          aDX[1] >= theSelection[1] && aDX[1] <= theSelection[3])
       {
        //cout<<"aPntId "<<aPntId<<"; aDX = {"<<aDX[0]<<", "<<aDX[1]<<", "<<aDX[2]<<"}\n";
+        static int aMaxRadius = 5;
+        int aDX0 = 0;
+        int aDX1 = 0;
+        int aRet = 0;
+        int aRadius = 1;
+        
         if (isThrough) goto ADD_VISIBLE; // RKV
 
-       int aDX0 = int(aDX[0]);
-       int aDX1 = int(aDX[1]);
+       aDX0 = int(aDX[0]);
+       aDX1 = int(aDX[1]);
 
-       int aRet = Check(aZPtr,theSelection,theTolerance,aDX[2],aDX0,aDX1);
+       aRet = Check(aZPtr,theSelection,theTolerance,aDX[2],aDX0,aDX1);
        if(aRet > 0)
          goto ADD_VISIBLE;
        if(aRet < 0)
          goto ADD_INVISIBLE;
 
-       static int aMaxRadius = 5;
-       for(int aRadius = 1; aRadius < aMaxRadius; aRadius++){
+       for(aRadius = 1; aRadius < aMaxRadius; aRadius++){
          int aStartDX[2] = {aDX0 - aRadius, aDX1 - aRadius};
          for(int i = 0; i <= aRadius; i++){
            int aRet = Check(aZPtr,theSelection,theTolerance,aDX[2],aStartDX[0]++,aStartDX[1]);

diff --git a/src/VTKViewer/VTKViewer_ConvexTool.cxx b/src/VTKViewer/VTKViewer_ConvexTool.cxx
index 6ba9ee1877769ae0c2665aa9ec14c2ba1c5b79bd..8ab7578d19f77c4701f0a227ed4085ed31b27fd9 100644 (file)
--- a/src/VTKViewer/VTKViewer_ConvexTool.cxx
+++ b/src/VTKViewer/VTKViewer_ConvexTool.cxx
@@ -32,9 +32,9 @@
 #include <set>
 #include <map>
 
-#ifdef WNT
+//#ifdef WNT
 #include <algorithm>
-#endif
+//#endif
 
 #include <vtkUnstructuredGrid.h>
 #include <vtkGeometryFilter.h>

diff --git a/src/VTKViewer/VTKViewer_ShrinkFilter.cxx b/src/VTKViewer/VTKViewer_ShrinkFilter.cxx
index b4a7fb6a27f338ccd6e8be17b62c1314299aafdd..886671ec43894d1ae66082fe62c7551d90abcb29 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ShrinkFilter.cxx
+++ b/src/VTKViewer/VTKViewer_ShrinkFilter.cxx
@@ -170,5 +170,5 @@ vtkIdType VTKViewer_ShrinkFilter::GetNodeObjId(int theVtkID)
 {
   if ( myVTK2ObjIds.empty() || theVtkID > (int)myVTK2ObjIds.size() )
     return -1;
-  return myVTK2ObjIds.at(theVtkID);
+  return myVTK2ObjIds[theVtkID];
 }