-// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-//
+// Copyright (C) 2007-2016 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
+//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#include "SUIT_DataOwner.h"
-#ifndef WNT
+#ifndef WIN32
#include <typeinfo>
#define _typeinfo std::type_info
#else
{
}
-/*! operator== : compares two owners*/
+/*! Operator == compares two owners*/
bool operator==( const SUIT_DataOwnerPtr& p1, const SUIT_DataOwnerPtr& p2 )
{
if ( !p1.isNull() && !p2.isNull() )
- return (p1->isEqual( *p2 ) && p2->isEqual( *p1 ));
+ return (p1->keyString() == p2->keyString());
return p1.isNull() && p2.isNull();
}
+
+/*! Operator < allows to order suit data owners for map */
+bool operator<( const SUIT_DataOwnerPtr& p1, const SUIT_DataOwnerPtr& p2 )
+{
+ if ( p1.isNull() && p2.isNull() )
+ return false;
+ else if ( p1.isNull() )
+ return true;
+ else if ( p2.isNull() )
+ return false;
+
+ return (p1->keyString() < p2->keyString());
+}
+
/*!
\class SUIT_DataOwnerPtrList
implements value list with unique items (uniqueness is
- provided by operator==())
+ provided by operator==() and operator<())
*/
/*!
Constructor (default)
*/
SUIT_DataOwnerPtrList::SUIT_DataOwnerPtrList()
- : QValueList<SUIT_DataOwnerPtr>(),
- mySkipEqual( true )
+: QList<SUIT_DataOwnerPtr>(),
+mySkipEqual( true )
{
}
Constructor (default)
*/
SUIT_DataOwnerPtrList::SUIT_DataOwnerPtrList( const bool skipAllEqual )
- : QValueList<SUIT_DataOwnerPtr>(),
- mySkipEqual( skipAllEqual )
+: QList<SUIT_DataOwnerPtr>(),
+mySkipEqual( skipAllEqual )
{
}
Constructor (copy)
*/
SUIT_DataOwnerPtrList::SUIT_DataOwnerPtrList( const SUIT_DataOwnerPtrList& l )
- : QValueList<SUIT_DataOwnerPtr>( l ),
- mySkipEqual( true )
+: QList<SUIT_DataOwnerPtr>( l ),
+mySkipEqual( true )
{
}
Constructor (copy)
*/
SUIT_DataOwnerPtrList::SUIT_DataOwnerPtrList( const SUIT_DataOwnerPtrList& l, const bool skipAllEqual )
- : QValueList<SUIT_DataOwnerPtr>(),
- mySkipEqual( skipAllEqual )
+: QList<SUIT_DataOwnerPtr>(),
+mySkipEqual( skipAllEqual )
{
if ( skipAllEqual == l.mySkipEqual )
operator =( l );
{
SUIT_DataOwnerPtrList::const_iterator beginIt = l.begin();
SUIT_DataOwnerPtrList::const_iterator endIt = l.end();
- for( ; beginIt != endIt; ++beginIt )
+ for ( ; beginIt != endIt; ++beginIt )
append( *beginIt );
}
}
-#ifndef QT_NO_STL
-/*!
- Constructor (from stl)
-*/
-SUIT_DataOwnerPtrList::SUIT_DataOwnerPtrList( const std::list<SUIT_DataOwnerPtr>& l )
- : QValueList<SUIT_DataOwnerPtr>( l ),
- mySkipEqual( true )
-{
-}
-#endif
-
-#ifndef QT_NO_STL
-/*!
- Constructor (from stl)
-*/
-SUIT_DataOwnerPtrList::SUIT_DataOwnerPtrList( const std::list<SUIT_DataOwnerPtr>& l, const bool skipAllEqual )
- : QValueList<SUIT_DataOwnerPtr>(),
- mySkipEqual( skipAllEqual )
-{
- std::list<SUIT_DataOwnerPtr>::const_iterator beginIt = l.begin();
- std::list<SUIT_DataOwnerPtr>::const_iterator endIt = l.begin();
- for( ; beginIt != endIt; ++beginIt )
- append( *beginIt );
-}
-#endif
-
/*!
Appends an item to the list
*/
-SUIT_DataOwnerPtrList::iterator SUIT_DataOwnerPtrList::append( const SUIT_DataOwnerPtr& x )
+void SUIT_DataOwnerPtrList::append( const SUIT_DataOwnerPtr& x )
{
- if( mySkipEqual && myMap.contains( x ) ) //contains uses SUIT_DataOwnerPtr::operator==
- return myMap[ x ];
+ if ( mySkipEqual && myMap.contains( x ) ) //contains uses SUIT_DataOwnerPtr::operator==
+ return;
- iterator it = QValueList<SUIT_DataOwnerPtr>::append( x );
+ QList<SUIT_DataOwnerPtr>::append( x );
- if( mySkipEqual )
- myMap.insert( x, it );
-
- return it;
+ if ( mySkipEqual )
+ myMap.insert( x, 0 );
}
/*!
*/
void SUIT_DataOwnerPtrList::clear()
{
- if( mySkipEqual )
+ if ( mySkipEqual )
myMap.clear();
- QValueList<SUIT_DataOwnerPtr>::clear();
+
+ QList<SUIT_DataOwnerPtr>::clear();
}
/*!
*/
uint SUIT_DataOwnerPtrList::remove(const SUIT_DataOwnerPtr& x )
{
- if( mySkipEqual && myMap.contains(x) )
- myMap.remove(x);
- return QValueList<SUIT_DataOwnerPtr>::remove( x );
-}
+ if ( mySkipEqual && myMap.contains(x) )
+ myMap.remove( x );
-/*!
- Operator < allows to order suit data owners for map
-*/
-bool operator<( const SUIT_DataOwnerPtr& p1, const SUIT_DataOwnerPtr& p2 )
-{
- return p1.get()<p2.get();
+ return QList<SUIT_DataOwnerPtr>::removeAll( x );
}
