Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/MUC/UnitTest/MockMUC.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swiften/MUC/UnitTest/MockMUC.cpp')
| -rw-r--r-- | Swiften/MUC/UnitTest/MockMUC.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Swiften/MUC/UnitTest/MockMUC.cpp b/Swiften/MUC/UnitTest/MockMUC.cpp index 6131183..93e7d0b 100644 --- a/Swiften/MUC/UnitTest/MockMUC.cpp +++ b/Swiften/MUC/UnitTest/MockMUC.cpp @@ -18,34 +18,34 @@ MockMUC::~MockMUC() { void MockMUC::insertOccupant(const MUCOccupant& occupant) { - occupants_.insert(std::make_pair(occupant.getNick(), occupant)); - onOccupantJoined(occupant); + occupants_.insert(std::make_pair(occupant.getNick(), occupant)); + onOccupantJoined(occupant); } const MUCOccupant& MockMUC::getOccupant(const std::string& nick) { - return occupants_.find(nick)->second; + return occupants_.find(nick)->second; } bool MockMUC::hasOccupant(const std::string& nick) { - return occupants_.find(nick) != occupants_.end(); + return occupants_.find(nick) != occupants_.end(); } void MockMUC::changeAffiliation(const JID &jid, MUCOccupant::Affiliation newAffilation) { - std::map<std::string, MUCOccupant>::iterator i = occupants_.find(jid.getResource()); - if (i != occupants_.end()) { - const MUCOccupant old = i->second; - i->second = MUCOccupant(old.getNick(), old.getRole(), newAffilation); - onOccupantAffiliationChanged(i->first, newAffilation, old.getAffiliation()); - } + std::map<std::string, MUCOccupant>::iterator i = occupants_.find(jid.getResource()); + if (i != occupants_.end()) { + const MUCOccupant old = i->second; + i->second = MUCOccupant(old.getNick(), old.getRole(), newAffilation); + onOccupantAffiliationChanged(i->first, newAffilation, old.getAffiliation()); + } } void MockMUC::changeOccupantRole(const JID &jid, MUCOccupant::Role newRole) { - std::map<std::string, MUCOccupant>::iterator i = occupants_.find(jid.getResource()); - if (i != occupants_.end()) { - const MUCOccupant old = i->second; - i->second = MUCOccupant(old.getNick(), newRole, old.getAffiliation()); - onOccupantRoleChanged(i->first, i->second, old.getRole()); - } + std::map<std::string, MUCOccupant>::iterator i = occupants_.find(jid.getResource()); + if (i != occupants_.end()) { + const MUCOccupant old = i->second; + i->second = MUCOccupant(old.getNick(), newRole, old.getAffiliation()); + onOccupantRoleChanged(i->first, i->second, old.getRole()); + } } } |