mira-dev team mailing list archive
-
mira-dev team
-
Mailing list archive
-
Message #00102
[Merge] lp:~mira-dev/mira/workplace-desc into lp:mira
John Deal has proposed merging lp:~mira-dev/mira/workplace-desc into lp:mira.
Requested reviews:
Mira Core Development Team (mira-dev)
For more details, see:
https://code.launchpad.net/~mira-dev/mira/workplace-desc/+merge/44730
Changed mira-server/include/network/messages/MsgNewGroup.h constructor MsgNewGroup::MsgNewGroup() to place spaces between parts of a multi-word Workplace Description.
--
https://code.launchpad.net/~mira-dev/mira/workplace-desc/+merge/44730
Your team Mira Core Development Team is requested to review the proposed merge of lp:~mira-dev/mira/workplace-desc into lp:mira.
=== modified file 'mira-server/include/network/messages/MsgNewGroup.h'
--- mira-server/include/network/messages/MsgNewGroup.h 2010-05-27 15:07:30 +0000
+++ mira-server/include/network/messages/MsgNewGroup.h 2010-12-27 12:57:53 +0000
@@ -67,14 +67,23 @@
// assamble description
std::string description;
- unsigned int i = 2;
- for (; i < message_field.size(); ++i)
+ const int descMsgStartIndex = 2;
+ int descMsgIndex = descMsgStartIndex;
+
+ for (; descMsgIndex < message_field.size(); ++descMsgIndex)
{
- description += message_field[i];
+ description += message_field[descMsgIndex];
+ description += ' '; // Separate words of description
}
- // Delete " characters
- if (description[0] == '\"')
+ // Delete trailing space if needed.
+ if (descMsgIndex > descMsgStartIndex)
+ {
+ description.erase(description.length()-1);
+ }
+
+ // Delete " characters
+ if (description[0] == '\"')
description.erase(0, 1);
if (description[description.length()-1] == '\"')