User: rt Date: 05/09/05 01:59:53 Modified: /dba/dbaccess/source/ui/inc/ indexcollection.hxx
Log: INTEGRATION: CWS hr18 (1.4.424); FILE MERGED 2005/08/10 16:52:16 hr 1.4.424.1: #i51878#,#i53108#: cleanup STL iterator usage File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: indexcollection.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/indexcollection.hxx?r1=1.4&r2=1.5 Delta lines: +16 -16 --------------------- --- indexcollection.hxx 19 Mar 2003 17:52:40 -0000 1.4 +++ indexcollection.hxx 5 Sep 2005 08:59:50 -0000 1.5 @@ -126,29 +126,29 @@ typedef OIndex const* const_iterator; /// get access to the first element of the index collection - const_iterator begin() const { return m_aIndexes.begin(); } + Indexes::const_iterator begin() const { return m_aIndexes.begin(); } /// get access to the first element of the index collection - iterator begin() { return m_aIndexes.begin(); } + Indexes::iterator begin() { return m_aIndexes.begin(); } /// get access to the (last + 1st) element of the index collection - const_iterator end() const { return m_aIndexes.end(); } + Indexes::const_iterator end() const { return m_aIndexes.end(); } /// get access to the (last + 1st) element of the index collection - iterator end() { return m_aIndexes.end(); } + Indexes::iterator end() { return m_aIndexes.end(); } // searching - const_iterator find(const String& _rName) const; - iterator find(const String& _rName); - const_iterator findOriginal(const String& _rName) const; - iterator findOriginal(const String& _rName); + Indexes::const_iterator find(const String& _rName) const; + Indexes::iterator find(const String& _rName); + Indexes::const_iterator findOriginal(const String& _rName) const; + Indexes::iterator findOriginal(const String& _rName); // inserting without committing // the OriginalName of the newly inserted index will be empty, thus indicating that it's new - iterator insert(const String& _rName); + Indexes::iterator insert(const String& _rName); // commit a new index, which is already part if the collection, but does not have an equivalent in the // data source, yet - void commitNewIndex(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); + void commitNewIndex(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); // reset the data for the given index - void resetIndex(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); + void resetIndex(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); // attach to a new key container void attach(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); @@ -161,9 +161,9 @@ sal_Int32 size() const { return m_aIndexes.size(); } /// drop an index, and remove it from the collection - sal_Bool drop(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); + sal_Bool drop(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); /// simply drop the index described by the name, but don't remove the descriptor from the collection - sal_Bool dropNoRemove(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); + sal_Bool dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException)); protected: void implConstructFrom(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
