Porting to Qt4

Compiler error with MS VC++ 7.1

diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.cxx b/src/DSC/DSC_Basic/ConnectionManager_i.cxx
index 260c88c7f87de2b98e5e6cae32b7a1a77cd4b12f..59f3b262408963334a2fbbaa08e133dabe894598 100644 (file)
--- a/src/DSC/DSC_Basic/ConnectionManager_i.cxx
+++ b/src/DSC/DSC_Basic/ConnectionManager_i.cxx
@@ -73,7 +73,7 @@ throw (Engines::DSC::PortNotDefined,
 }
 
 void
-ConnectionManager_i::disconnect(const Engines::ConnectionManager::connectionId id,
+ConnectionManager_i::disconnect(Engines::ConnectionManager::connectionId id,
                                Engines::DSC::Message message)
 throw (Engines::ConnectionManager::BadId)
 {

diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.hxx b/src/DSC/DSC_Basic/ConnectionManager_i.hxx
index e3475f2430e6653c091f2a975422dd2280762075..c0459f482cdaf9565b744b7d29d01c714b131ed5 100644 (file)
--- a/src/DSC/DSC_Basic/ConnectionManager_i.hxx
+++ b/src/DSC/DSC_Basic/ConnectionManager_i.hxx
@@ -63,7 +63,7 @@ class DSC_BASIC_EXPORT ConnectionManager_i :
      *
      * \see Engines::ConnectionManager::disconnect
      */
-    void disconnect(const Engines::ConnectionManager::connectionId id,
+    void disconnect(Engines::ConnectionManager::connectionId id,
                    Engines::DSC::Message message)
       throw (Engines::ConnectionManager::BadId);
 

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index d8de3a179d37d4434bb03802886063b173734981..7bdf7d5590629c4abc0b0ddc6a929db29df8cbec 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -113,8 +113,7 @@ SALOME_ModuleCatalogImpl::SALOME_ModuleCatalogImpl(int argc, char** argv, CORBA:
     
     QStringList dirList;
 #ifdef WNT
-    dirList = QStringList::split( SEPARATOR, _general_path, 
-                                 false ); // skip empty entries
+    dirList = QString( _general_path ).split( SEPARATOR, QString::SkipEmptyParts ); // skip empty entries
 #else
     //check for new format
     if ( QString( _general_path ).contains(SEPARATOR) ) {