libtransport.git Changeset - 1af263f488e8

Changeset - 1af263f488e8

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 13 years ago 2013-01-23 19:41:56
hanzz.k@gmail.com

make enum for Participant.flags

4 files changed with 25 insertions and 8 deletions:

include/transport/conversation.h

include/transport/protocol.proto

src/conversation.cpp

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

include/transport/conversation.h

➞

Show inline comments

@@ @@ -33,15 +33,22 @@ class ConversationManager; @@
 /// Represents one XMPP-Legacy network conversation.
 class Conversation {
 	public:
 		typedef enum {
 			PARTICIPANT_FLAG_NONE = 0,
 			PARTICIPANT_FLAG_MODERATOR = 1,
 			PARTICIPANT_FLAG_CONFLICT = 2,
 			PARTICIPANT_FLAG_BANNED = 4,
 			PARTICIPANT_FLAG_NOT_AUTHORIZED = 8,
 			PARTICIPANT_FLAG_ME = 16,
 			PARTICIPANT_FLAG_KICKED = 32
 		} ParticipantFlag;
 		typedef struct _Participant {
-			int flag;
+			ParticipantFlag flag;
 			int status;
 			std::string statusMessage;
 		} Participant;
 		/// Type of participants in MUC rooms.
 		enum ParticipantFlag {None, Moderator};
 		/// Creates new conversation.
 		/// \param conversationManager ConversationManager associated with this Conversation.
@@ @@ -70,7 +77,7 @@ class Conversation { @@
 		/// \param status Current status of this participant.
 		/// \param statusMessage Current status message of this participant.
 		/// \param newname If participant was renamed, this variable contains his new name.
-		void handleParticipantChanged(const std::string &nickname, int flag, int status = Swift::StatusShow::None, const std::string &statusMessage = "", const std::string &newname = "");
+		void handleParticipantChanged(const std::string &nickname, ParticipantFlag flag, int status = Swift::StatusShow::None, const std::string &statusMessage = "", const std::string &newname = "");
 		/// Sets XMPP user nickname in MUC rooms.

include/transport/protocol.proto

➞

Show inline comments

@@ @@ -86,6 +86,16 @@ message RoomList { @@
 	repeated string name = 2;
+}
 enum ParticipantFlag {
 	PARTICIPANT_FLAG_NONE = 0;
 	PARTICIPANT_FLAG_MODERATOR = 1;
 	PARTICIPANT_FLAG_CONFLICT = 2;
 	PARTICIPANT_FLAG_BANNED = 4;
 	PARTICIPANT_FLAG_NOT_AUTHORIZED = 8;
 	PARTICIPANT_FLAG_ME = 16;
 	PARTICIPANT_FLAG_KICKED = 32;
+}
 message Participant {
 	required string userName = 1;
 	required string room = 2;

src/conversation.cpp

➞

Show inline comments

 	item.affiliation = Swift::MUCOccupant::Member;
 	item.role = Swift::MUCOccupant::Participant;
-	if (flag & Moderator) {
+	if (flag & PARTICIPANT_FLAG_MODERATOR) {
 		item.affiliation = Swift::MUCOccupant::Admin;
 		item.role = Swift::MUCOccupant::Moderator;
+	}
 	return presence;
+}
-void Conversation::handleParticipantChanged(const std::string &nick, int flag, int status, const std::string &statusMessage, const std::string &newname) {
+void Conversation::handleParticipantChanged(const std::string &nick, Conversation::ParticipantFlag flag, int status, const std::string &statusMessage, const std::string &newname) {
 	Swift::Presence::ref presence = generatePresence(nick, flag, status, statusMessage, newname);
 	if (presence->getType() == Swift::Presence::Unavailable) {

src/networkpluginserver.cpp

➞

Show inline comments

 		return;
+	}
 	conv->handleParticipantChanged(payload.nickname(), payload.flag(), payload.status(), payload.statusmessage(), payload.newname());
+	conv->handleParticipantChanged(payload.nickname(), (Conversation::ParticipantFlag) payload.flag(), payload.status(), payload.statusmessage(), payload.newname());
+}
 void NetworkPluginServer::handleRoomChangedPayload(const std::string &data) {

0 comments (0 inline, 0 general)