From 41bab39f496ff5e4cc21caa2af5895b4da2fca9c Mon Sep 17 00:00:00 2001 From: san Date: Tue, 5 Jun 2007 09:03:59 +0000 Subject: [PATCH] Porting to Qt4 Compiler error with MS VC++ 7.1 --- src/DSC/DSC_Basic/ConnectionManager_i.cxx | 2 +- src/DSC/DSC_Basic/ConnectionManager_i.hxx | 2 +- src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.cxx b/src/DSC/DSC_Basic/ConnectionManager_i.cxx index 260c88c7f..59f3b2624 100644 --- 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 e3475f243..c0459f482 100644 --- 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 d8de3a179..7bdf7d559 100644 --- 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) ) { -- 2.39.2