summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-05-08 17:18:21 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-05-08 17:22:18 (GMT)
commit09de88ddd4377a53a880b98d63bbe391eba982b9 (patch)
treebaa45c64b17eff11c22be25ba52271ee822268fd /Swiften/Elements
parentfc7c2dd9140b38df288450a4732297b53188e87a (diff)
downloadswift-09de88ddd4377a53a880b98d63bbe391eba982b9.zip
swift-09de88ddd4377a53a880b98d63bbe391eba982b9.tar.bz2
Renamed Conference->Room.
Diffstat (limited to 'Swiften/Elements')
-rw-r--r--Swiften/Elements/Storage.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Elements/Storage.h b/Swiften/Elements/Storage.h
index dcc4b85..7d978d1 100644
--- a/Swiften/Elements/Storage.h
+++ b/Swiften/Elements/Storage.h
@@ -15,8 +15,8 @@
namespace Swift {
class Storage : public Payload {
public:
- struct Conference {
- Conference() : autoJoin(false) {}
+ struct Room {
+ Room() : autoJoin(false) {}
String name;
JID jid;
@@ -35,11 +35,11 @@ namespace Swift {
Storage() {
}
- const std::vector<Conference>& getConferences() const {
+ const std::vector<Room>& getRooms() const {
return conferences;
}
- void addConference(const Conference& conference) {
+ void addRoom(const Room& conference) {
conferences.push_back(conference);
}
@@ -52,7 +52,7 @@ namespace Swift {
}
private:
- std::vector<Conference> conferences;
+ std::vector<Room> conferences;
std::vector<URL> urls;
};
}