From 83b3e02f69971498cd8ad2e354f1bafbffaaae62 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Tue, 5 Jan 2010 21:00:05 +0000 Subject: [PATCH] Minor renaming. We don't have any other iterators here, so const_iterator is fine. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32778 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/KeyMap.cpp | 4 ++-- src/LyXAction.cpp | 4 ++-- src/LyXAction.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp index 51aefe560e..beb68a0f0c 100644 --- a/src/KeyMap.cpp +++ b/src/KeyMap.cpp @@ -485,8 +485,8 @@ KeyMap::BindingList KeyMap::listBindings(bool unbound, KeyMap::ItemType tag) con BindingList list; listBindings(list, KeySequence(0, 0), tag); if (unbound) { - LyXAction::const_func_iterator fit = lyxaction.func_begin(); - LyXAction::const_func_iterator fit_end = lyxaction.func_end(); + LyXAction::const_iterator fit = lyxaction.func_begin(); + LyXAction::const_iterator fit_end = lyxaction.func_end(); for (; fit != fit_end; ++fit) { FuncCode action = fit->second; bool has_action = false; diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index ebaeec6ded..7282e53e2b 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3508,13 +3508,13 @@ bool LyXAction::funcHasFlag(FuncCode action, } -LyXAction::const_func_iterator LyXAction::func_begin() const +LyXAction::const_iterator LyXAction::func_begin() const { return lyx_func_map.begin(); } -LyXAction::const_func_iterator LyXAction::func_end() const +LyXAction::const_iterator LyXAction::func_end() const { return lyx_func_map.end(); } diff --git a/src/LyXAction.h b/src/LyXAction.h index 6d0e8228e7..f818b8f206 100644 --- a/src/LyXAction.h +++ b/src/LyXAction.h @@ -93,13 +93,13 @@ public: bool funcHasFlag(FuncCode action, FuncAttribs flag) const; /// iterator across all real actions - typedef FuncMap::const_iterator const_func_iterator; + typedef FuncMap::const_iterator const_iterator; /// return an iterator to the start of all real actions - const_func_iterator func_begin() const; + const_iterator func_begin() const; /// return an iterator to the end of all real actions - const_func_iterator func_end() const; + const_iterator func_end() const; private: /// populate the action container with our actions -- 2.39.2