[ekiga] Simplification du code de Ekiga::DialectImpl (via des typedef typename)
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Simplification du code de Ekiga::DialectImpl (via des typedef typename)
- Date: Sat, 9 Feb 2013 22:52:04 +0000 (UTC)
commit 4e48b5d6d440f5b74eab09bd1484da132f9093dd
Author: Julien Puydt <jpuydt free fr>
Date: Sat Feb 9 23:50:10 2013 +0100
Simplification du code de Ekiga::DialectImpl (via des typedef typename)
lib/engine/chat/dialect-impl.h | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/lib/engine/chat/dialect-impl.h b/lib/engine/chat/dialect-impl.h
index f14b48a..2e602d3 100644
--- a/lib/engine/chat/dialect-impl.h
+++ b/lib/engine/chat/dialect-impl.h
@@ -75,10 +75,13 @@ namespace Ekiga
/* More STL-like ways to access the chats within this Ekiga::DialectImpl
*/
- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator;
- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator;
- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator;
- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator;
+ typedef typename std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats_type;
+ typedef typename std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats_type;
+
+ typedef typename Ekiga::map_key_iterator<simple_chats_type> simple_iterator;
+ typedef typename Ekiga::map_key_const_iterator<simple_chats_type> simple_const_iterator;
+ typedef typename Ekiga::map_key_iterator<multiple_chats_type> multiple_iterator;
+ typedef typename Ekiga::map_key_const_iterator<multiple_chats_type> multiple_const_iterator;
simple_iterator simple_begin ();
simple_iterator simple_end ();
@@ -116,8 +119,8 @@ namespace Ekiga
private:
- std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats;
- std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats;
+ simple_chats_type simple_chats;
+ multiple_chats_type multiple_chats;
void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat);
@@ -133,7 +136,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::DialectImpl ()
template<typename SimpleChatType, typename MultipleChatType>
Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl ()
{
- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin ();
+ for (typename simple_chats_type::iterator iter = simple_chats.begin ();
iter != simple_chats.end ();
iter++) {
@@ -144,7 +147,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl ()
conn_iter->disconnect ();
}
}
- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin ();
+ for (typename multiple_chats_type::iterator iter = multiple_chats.begin ();
iter != multiple_chats.end ();
iter++) {
@@ -163,7 +166,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_simple_chats (boost:
{
bool go_on = true;
- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin ();
+ for (typename simple_chats_type::const_iterator iter = simple_chats.begin ();
go_on && iter != simple_chats.end ();
iter++) {
@@ -177,7 +180,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_multiple_chats (boos
{
bool go_on = true;
- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin ();
+ for (typename multiple_chats_type::const_iterator iter = multiple_chats.begin ();
go_on && iter != multiple_chats.end ();
iter++) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]