- class KeyStream extracted to the separate module;

- xml attributes redesigned to produce efficient code;
- many small improvements

git-svn-id: http://svn.miranda-ng.org/main/trunk@11905 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 2 insertions, 4 deletions

diff --git a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.h b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.h
index 92a8b82e4c..0271e8dc66 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.h
+++ b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.h
@@ -370,7 +370,7 @@ class WAConnection {
 	void sendMessageWithBody(FMessage* message) throw(WAException);

 	std::map<string, string>* parseCategories(ProtocolTreeNode* node) throw(WAException);

 	void parseMessageInitialTagAlreadyChecked(ProtocolTreeNode* node) throw(WAException);

-	ProtocolTreeNode* getReceiptAck(const std::string& to, const std::string& id, const std::string& receiptType) throw(WAException);

+	ProtocolTreeNode getReceiptAck(const std::string& to, const std::string& id, const std::string& receiptType) throw(WAException);

 	std::string makeId(const std::string& prefix);

 	void sendGetGroups(const std::string& id, const std::string& type) throw (WAException);

 	void readGroupList(ProtocolTreeNode* node, std::vector<std::string>& groups) throw (WAException);

@@ -378,8 +378,7 @@ class WAConnection {
 	void readAttributeList(ProtocolTreeNode* node, std::vector<std::string>& vector, const std::string& tag, const std::string& attribute) throw (WAException);

 	void sendVerbParticipants(const std::string& gjid, const std::vector<std::string>& participants, const std::string& id, const std::string& inner_tag) throw (WAException);

 	bool supportsReceiptAcks();

-	static ProtocolTreeNode* getMessageNode(FMessage* message, ProtocolTreeNode* node);

-	static ProtocolTreeNode* getSubjectMessage(const std::string& to, const std::string& id, ProtocolTreeNode* child) throw (WAException);

+	static ProtocolTreeNode getMessageNode(FMessage* message, ProtocolTreeNode* node);

 	std::vector<ProtocolTreeNode*>* processGroupSettings(const std::vector<GroupSetting>& gruops);

 

 	public:

@@ -407,7 +406,6 @@ class WAConnection {
 	void sendMessage(FMessage* message) throw(WAException);

 	void sendAvailableForChat() throw(WAException);

 	bool read() throw(WAException);

-	void sendNop() throw(WAException);

 	void sendPing() throw(WAException);

 	void sendQueryLastOnline(const std::string& jid) throw (WAException);

 	void sendPong(const std::string& id) throw(WAException);