[gnote] refactor all the "get_values" from map.
- From: Hubert Figuière <hub src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnote] refactor all the "get_values" from map.
- Date: Tue, 21 Apr 2009 17:42:56 -0400 (EDT)
commit 83c5170a5882f8092d3c06efec9587e38fd79d34
Author: Hubert Figuiere <hub figuiere net>
Date: Sat Apr 18 18:23:13 2009 -0400
refactor all the "get_values" from map.
---
src/note.cpp | 6 +---
src/sharp/map.hpp | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/tag.cpp | 6 +---
src/tagmanager.cpp | 6 +---
4 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/src/note.cpp b/src/note.cpp
index c17de58..ee18d19 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -49,6 +49,7 @@
#include "debug.hpp"
#include "sharp/exception.hpp"
#include "sharp/files.hpp"
+#include "sharp/map.hpp"
#include "sharp/string.hpp"
#include "sharp/xmlconvert.hpp"
#include "sharp/xmlwriter.hpp"
@@ -1057,10 +1058,7 @@ namespace gnote {
void Note::get_tags(std::list<Tag::Ptr> & l) const
{
- for(NoteData::TagMap::const_iterator iter = m_data.data().tags().begin();
- iter != m_data.data().tags().end(); ++iter) {
- l.push_back(iter->second);
- }
+ sharp::map_get_values(m_data.data().tags(), l);
}
const char *NoteArchiver::CURRENT_VERSION = "0.3";
diff --git a/src/sharp/map.hpp b/src/sharp/map.hpp
new file mode 100644
index 0000000..1276cc8
--- /dev/null
+++ b/src/sharp/map.hpp
@@ -0,0 +1,61 @@
+/*
+ * gnote
+ *
+ * Copyright (C) 2009 Hubert Figuiere
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef __SHARP_MAP_HPP_
+#define __SHARP_MAP_HPP_
+
+#include <list>
+#include <map>
+
+namespace sharp {
+
+
+ /** get all the mapped elements from the map. */
+ template <typename _Map>
+ void map_get_values(const _Map & m, std::list<typename _Map::mapped_type> & l)
+ {
+ l.clear();
+ for(typename _Map::const_iterator iter = m.begin();
+ iter != m.end(); ++iter) {
+ l.push_back(iter->second);
+ }
+ }
+
+
+ /** call operator delete on all the data element. */
+ template <typename _Map>
+ void map_delete_all_second(const _Map & m)
+ {
+ for(typename _Map::const_iterator iter = m.begin();
+ iter != m.end(); ++iter) {
+ delete iter->second;
+ }
+ }
+
+}
+
+
+#endif
diff --git a/src/tag.cpp b/src/tag.cpp
index 0da50c2..a2a7108 100644
--- a/src/tag.cpp
+++ b/src/tag.cpp
@@ -21,6 +21,7 @@
#include <map>
+#include "sharp/map.hpp"
#include "sharp/string.hpp"
#include "note.hpp"
#include "tag.hpp"
@@ -84,10 +85,7 @@ namespace gnote {
void Tag::get_notes(std::list<Note *> & l) const
{
- for(NoteMap::const_iterator iter = m_notes->begin();
- iter != m_notes->end(); ++iter) {
- l.push_back(iter->second);
- }
+ sharp::map_get_values(*m_notes, l);
}
diff --git a/src/tagmanager.cpp b/src/tagmanager.cpp
index 03c01a0..ff973d0 100644
--- a/src/tagmanager.cpp
+++ b/src/tagmanager.cpp
@@ -23,6 +23,7 @@
#include "tagmanager.hpp"
#include "debug.hpp"
#include "note.hpp"
+#include "sharp/map.hpp"
#include "sharp/string.hpp"
#include "sharp/exception.hpp"
@@ -226,10 +227,7 @@ namespace gnote {
void TagManager::all_tags(std::list<Tag::Ptr> & tags) const
{
// Add in the system tags first
- for(InternalMap::const_iterator iter = m_internal_tags.begin();
- iter != m_internal_tags.end(); ++iter) {
- tags.push_back(iter->second);
- }
+ sharp::map_get_values(m_internal_tags, tags);
// Now all the other tags
for(TagMap::const_iterator iter = m_tag_map.begin();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]