diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2005-09-05 07:59:50 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2005-09-05 07:59:50 +0000 |
commit | d9e22403458ee5cf07d27eb964229a58bfad62a4 (patch) | |
tree | 25e3efadfd95ad2fca89edfbb3a4ec902e01ee3c /dbaccess/source/ui/inc/indexcollection.hxx | |
parent | INTEGRATION: CWS hr18 (1.19.86); FILE MERGED (diff) | |
download | core-d9e22403458ee5cf07d27eb964229a58bfad62a4.tar.gz core-d9e22403458ee5cf07d27eb964229a58bfad62a4.zip |
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
Diffstat (limited to 'dbaccess/source/ui/inc/indexcollection.hxx')
-rw-r--r-- | dbaccess/source/ui/inc/indexcollection.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index 4e8ef1210f37..a632f795866c 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -2,9 +2,9 @@ * * $RCSfile: indexcollection.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-03-19 17:52:40 $ + * last change: $Author: rt $ $Date: 2005-09-05 08:59:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,29 +126,29 @@ namespace dbaui 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 @@ namespace dbaui 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); |