Index: src/libstring/TStringArray.cpp =================================================================== diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -rfadd6c9c628de875716d96c3a497b5bc6c8dca8a --- src/libstring/TStringArray.cpp (.../TStringArray.cpp) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187) +++ src/libstring/TStringArray.cpp (.../TStringArray.cpp) (revision fadd6c9c628de875716d96c3a497b5bc6c8dca8a) @@ -22,204 +22,7 @@ // ============================================================================ #include "stdafx.h" #include "TStringArray.h" -#include "TStringException.h" namespace string { - /////////////////////////////////////////////////////////////////////////////////////////////////////// - // class TStringArrayIterator - - TStringArrayIterator::TStringArrayIterator(std::vector::iterator iterArray) : - m_iterArray(iterArray) - { - } - - TStringArrayIterator::TStringArrayIterator() - { - } - - TStringArrayIterator::~TStringArrayIterator() - { - } - - TStringArrayIterator TStringArrayIterator::operator++(int) - { - TStringArrayIterator iterCurrent = *this; - ++m_iterArray; - return iterCurrent; - } - - TStringArrayIterator& TStringArrayIterator::operator++() - { - ++m_iterArray; - return *this; - } - - bool TStringArrayIterator::operator==(const TStringArrayIterator& rSrc) const - { - return m_iterArray == rSrc.m_iterArray; - } - - bool TStringArrayIterator::operator!=(const TStringArrayIterator& rSrc) const - { - return m_iterArray != rSrc.m_iterArray; - } - - TString& TStringArrayIterator::operator*() - { - return *m_iterArray; - } - - const TString& TStringArrayIterator::operator*() const - { - return *m_iterArray; - } - - /////////////////////////////////////////////////////////////////////////////////////////////////////// - // class TStringArrayConstIterator - - TStringArrayConstIterator::TStringArrayConstIterator(std::vector::const_iterator iterArray) : - m_iterArray(iterArray) - { - } - - TStringArrayConstIterator::TStringArrayConstIterator() - { - } - - TStringArrayConstIterator::~TStringArrayConstIterator() - { - } - - TStringArrayConstIterator TStringArrayConstIterator::operator++(int) - { - TStringArrayConstIterator iterCurrent = *this; - ++m_iterArray; - return iterCurrent; - } - - TStringArrayConstIterator& TStringArrayConstIterator::operator++() - { - ++m_iterArray; - return *this; - } - - bool TStringArrayConstIterator::operator==(const TStringArrayConstIterator& rSrc) const - { - return m_iterArray == rSrc.m_iterArray; - } - - bool TStringArrayConstIterator::operator!=(const TStringArrayConstIterator& rSrc) const - { - return m_iterArray != rSrc.m_iterArray; - } - - const TString& TStringArrayConstIterator::operator*() - { - return *m_iterArray; - } - - const TString& TStringArrayConstIterator::operator*() const - { - return *m_iterArray; - } - - /////////////////////////////////////////////////////////////////////////////////////////////////////// - // class TStringArray - void TStringArray::Add(const TString& str) - { - m_vItems.push_back(str); - } - - void TStringArray::InsertAt(size_t stIndex, const TString& str) - { - if (stIndex >= m_vItems.size()) - throw TStringException("stIndex out of bounds"); - - m_vItems.insert(m_vItems.begin() + stIndex, str); - } - - void TStringArray::SetAt(size_t stIndex, const TString& str) - { - if (stIndex >= m_vItems.size()) - throw TStringException("stIndex out of bounds"); - - m_vItems[stIndex] = str; - } - - void TStringArray::RemoveAt(size_t stIndex) - { - if (stIndex >= m_vItems.size()) - throw TStringException("stIndex out of bounds"); - - m_vItems.erase(m_vItems.begin() + stIndex); - } - - void TStringArray::Clear() - { - m_vItems.clear(); - } - - const TString& TStringArray::GetAt(size_t stIndex) const - { - if (stIndex >= m_vItems.size()) - throw TStringException("stIndex out of bounds"); - - return m_vItems.at(stIndex); - } - - size_t TStringArray::GetCount() const - { - return m_vItems.size(); - } - - TStringArrayIterator TStringArray::Begin() - { - return TStringArrayIterator(m_vItems.begin()); - } - - TStringArrayIterator TStringArray::End() - { - return TStringArrayIterator(m_vItems.end()); - } - - TStringArrayConstIterator TStringArray::Begin() const - { - return TStringArrayConstIterator(m_vItems.begin()); - } - - TStringArrayConstIterator TStringArray::End() const - { - return TStringArrayConstIterator(m_vItems.end()); - } - - bool TStringArray::operator==(const TStringArray& rSrc) const - { - if (rSrc.GetCount() != GetCount()) - return false; - - size_t stCount = GetCount(); - while (stCount-- > 0) - { - if (m_vItems[stCount] != rSrc.m_vItems[stCount]) - return false; - } - - return true; - } - - bool TStringArray::operator!=(const TStringArray& rSrc) const - { - if (rSrc.GetCount() != GetCount()) - return true; - - size_t stCount = GetCount(); - while (stCount-- > 0) - { - if (m_vItems[stCount] != rSrc.m_vItems[stCount]) - return true; - } - - return false; - } }