diff options
author | Jamie Fraser <jamie.f@mumbledog.com> | 2011-04-03 02:51:41 +0400 |
---|---|---|
committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2011-04-08 04:38:32 +0400 |
commit | bd690db64560cd1785c9aaed86547ffe681b60db (patch) | |
tree | 0c0d2e3a0aec81f7dbf891960e76bf0f5c13d2cd /src/murmur/MurmurIce.cpp | |
parent | 1d832d56ff0db9ccc7868d634759a1e91b46bc7d (diff) |
Fixed up Otto's patch (#2911421), mostly style stuff. Changed int -> uint and iterators to foreach()
Diffstat (limited to 'src/murmur/MurmurIce.cpp')
-rw-r--r-- | src/murmur/MurmurIce.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index a15760793..2447090ca 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -178,21 +178,16 @@ static void infoToInfo(const Murmur::UserInfoMap &im, QMap<int, QString> &info) } static void textmessageToTextmessage(const ::TextMessage &tm, Murmur::TextMessage &tmdst) { - tmdst.text = u8(tm.text); + tmdst.text = u8(tm.qsText); - QList<int>::const_iterator i; - - for (i = tm.sessions.begin(); i != tm.sessions.end(); ++i) { - tmdst.sessions.push_back(*i); - } + foreach (unsigned int i, tm.qlSessions) + tmdst.sessions.push_back(i); - for (i = tm.channels.begin(); i != tm.channels.end(); ++i) { - tmdst.channels.push_back(*i); - } - - for (i = tm.trees.begin(); i != tm.trees.end(); ++i) { - tmdst.trees.push_back(*i); - } + foreach (unsigned int i, tm.qlChannels) + tmdst.channels.push_back(i); + + foreach (unsigned int i, tm.qlTrees) + tmdst.trees.push_back(i); } class ServerLocator : public virtual Ice::ServantLocator { |