From: Fridrich S. <str...@us...> - 2008-12-06 17:02:35
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3996/src/lib Modified Files: WPXPropertyListVector.cpp WPXPropertyListVector.h Log Message: make the operator= in WPXPropertyListVector return reference instead of const reference + remove obsolete stuff Index: WPXPropertyListVector.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPropertyListVector.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- WPXPropertyListVector.cpp 3 Dec 2008 05:28:07 -0000 1.11 +++ WPXPropertyListVector.cpp 6 Dec 2008 17:02:25 -0000 1.12 @@ -113,11 +113,11 @@ return m_impl->operator[](index); } -const WPXPropertyListVector& WPXPropertyListVector::operator=(const WPXPropertyListVector &vec) +WPXPropertyListVector& WPXPropertyListVector::operator=(const WPXPropertyListVector &vect) { - m_impl->m_vector = vec.m_impl->m_vector; + m_impl->m_vector = vect.m_impl->m_vector; return *this; -} +} WPXPropertyListVector::Iter::Iter(const WPXPropertyListVector &vect) : m_iterImpl(new WPXPropertyListVectorIterImpl(&(static_cast<WPXPropertyListVectorImpl* >(vect.m_impl)->m_vector))) Index: WPXPropertyListVector.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPropertyListVector.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- WPXPropertyListVector.h 3 Dec 2008 05:28:07 -0000 1.10 +++ WPXPropertyListVector.h 6 Dec 2008 17:02:25 -0000 1.11 @@ -28,15 +28,11 @@ #define WPXPROPERTYLISTVECTOR_H #include <sys/types.h> -class WPXPropertyList; +#include "WPXPropertyList.h" class WPXPropertyListVectorImpl; class WPXPropertyListVectorIterImpl; -// NOTE: this class is meant to be used in libwpd's headers (to work around symbol problems -// when different versions of the STL are in use), and should not be used inside your application -// (it will only slow it down with a pointless layer of abstraction) - class WPXPropertyListVector { public: @@ -47,7 +43,7 @@ void append(const WPXPropertyListVector &vec); size_t count() const; const WPXPropertyList& operator[](size_t index) const; - const WPXPropertyListVector& operator=(const WPXPropertyListVector&); + WPXPropertyListVector& operator=(const WPXPropertyListVector& vect); class Iter { |