[PATCH] Simplify logic to use std::vector's .empty()

Kevin Hunter hunteke at earlham.edu
Tue Oct 4 15:56:18 PDT 2011


No need to muck about with iterators, adding a loop, and 2 function
calls to test for empty: it's a std::vector under the hood, so use
.empty(), and inline it.
---
 autodoc/inc/ary_i/ci_text2.hxx           |    2 +-
 autodoc/source/ary_i/kernel/ci_text2.cxx |   12 ------------
 2 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/autodoc/inc/ary_i/ci_text2.hxx b/autodoc/inc/ary_i/ci_text2.hxx
index 8e1c202..eef1d63 100644
--- a/autodoc/inc/ary_i/ci_text2.hxx
+++ b/autodoc/inc/ary_i/ci_text2.hxx
@@ -72,7 +72,7 @@ class DocuTex2
                             DYN DocuToken &     let_drToken );
 
     const TokenList &   Tokens() const          { return aTokens; }
-    bool                IsEmpty() const;
+    bool                IsEmpty() const         { return aTokens.empty(); }
     const String &      TextOfFirstToken() const;
 
     String &            Access_TextOfFirstToken();
diff --git a/autodoc/source/ary_i/kernel/ci_text2.cxx b/autodoc/source/ary_i/kernel/ci_text2.cxx
index 00a5a7e..dea062f 100644
--- a/autodoc/source/ary_i/kernel/ci_text2.cxx
+++ b/autodoc/source/ary_i/kernel/ci_text2.cxx
@@ -76,18 +76,6 @@ DocuTex2::AddToken( DYN DocuToken & let_drToken )
     }
     aTokens.push_back(&let_drToken);
 }
-
-bool
-DocuTex2::IsEmpty() const
-{
-    for ( ary::inf::DocuTex2::TokenList::const_iterator
-                iter = aTokens.begin();
-          iter != aTokens.end();
-        )
-    {
-        return false;
-    }
-    return true;
 }
 
 using csi::dsapi::DT_TextToken;
-- 
1.7.1


--------------090906010908090003060002--


More information about the LibreOffice mailing list