Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from branch mpa/qwt6_porting
[modules/gui.git]
/
src
/
LightApp
/
LightApp_SelectionMgr.cxx
diff --git
a/src/LightApp/LightApp_SelectionMgr.cxx
b/src/LightApp/LightApp_SelectionMgr.cxx
index 23e2c63528bcae74dc8deae9a40a7b0da3e3a023..cc4c573caa35fbbb736f42f16e471dfb9af19625 100644
(file)
--- a/
src/LightApp/LightApp_SelectionMgr.cxx
+++ b/
src/LightApp/LightApp_SelectionMgr.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-113,7
+113,7
@@
void LightApp_SelectionMgr::selectedObjects( SALOME_ListIO& theList, const QStri
if ( !owner )
continue;
if ( !owner )
continue;
- if ( !aSet.contains( owner->entry() ) ) {
+ if ( !aSet.contains( owner->entry() )
&& !owner->IO().IsNull()
) {
selList.append( owner->IO() );
aSet.insert( owner->entry() );
}
selList.append( owner->IO() );
aSet.insert( owner->entry() );
}
@@
-209,7
+209,7
@@
void LightApp_SelectionMgr::selectedObjects( QStringList& theList, const QString
if ( !owner )
continue;
if ( !owner )
continue;
- if ( !aSet.contains( owner->entry() ) ) {
+
if ( !aSet.contains( owner->entry() ) ) {
selList.append( owner->entry() );
aSet.insert( owner->entry() );
}
selList.append( owner->entry() );
aSet.insert( owner->entry() );
}
@@
-395,7
+395,7
@@
void LightApp_SelectionMgr::selectedSubOwners( MapEntryOfMapOfInteger& theMap )
dynamic_cast<const LightApp_DataSubOwner*>( (*itr).operator->() );
if ( subOwner )
{
dynamic_cast<const LightApp_DataSubOwner*>( (*itr).operator->() );
if ( subOwner )
{
-//#ifndef W
NT
+//#ifndef W
IN32
if ( !theMap.IsBound( TCollection_AsciiString(subOwner->entry().toLatin1().data()) ) )
//#else
// if ( !theMap.IsBound( subOwner->entry().toLatin1().data() ) )
if ( !theMap.IsBound( TCollection_AsciiString(subOwner->entry().toLatin1().data()) ) )
//#else
// if ( !theMap.IsBound( subOwner->entry().toLatin1().data() ) )