ok, wassup lib is not dependent on Miranda again

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

14 files changed, 27 insertions, 48 deletions

diff --git a/plugins/SmileyAdd/src/bkstring.h b/plugins/SmileyAdd/src/bkstring.h
index 552eeb9e3f..3a43c2bece 100644
--- a/plugins/SmileyAdd/src/bkstring.h
+++ b/plugins/SmileyAdd/src/bkstring.h
@@ -159,7 +159,7 @@ public:
 	bkstring& operator += (const value_type _Ch)

 	{ return append(1, _Ch); }

 

-	value_type& operator[] (int ind) const

+	value_type& operator[] (size_t ind) const

 	{ return buf[ind]; }

 

 	friend bkstring operator+ (const bkstring& _Str1, const bkstring& _Str2)

diff --git a/plugins/SmileyAdd/src/regexp/WCPattern.cpp b/plugins/SmileyAdd/src/regexp/WCPattern.cpp
index 3ab5e35f88..e44c835b39 100644
--- a/plugins/SmileyAdd/src/regexp/WCPattern.cpp
+++ b/plugins/SmileyAdd/src/regexp/WCPattern.cpp
@@ -624,9 +624,7 @@ NFAUNode * WCPattern::parseRegisteredWCPattern(NFAUNode ** end)
           (pattern[j] >= (wchar_t)'a' && pattern[j] <= (wchar_t)'z') ||

           (pattern[j] >= (wchar_t)'A' && pattern[j] <= (wchar_t)'Z') ||

           (pattern[j] >= (wchar_t)'0' && pattern[j] <= (wchar_t)'9') ||

-          (pattern[j] == (wchar_t)'_')

-         )

-        )

+          (pattern[j] == (wchar_t)'_')))

     {

       raiseError();

       return NULL;

diff --git a/protocols/WhatsApp/WhatsApp_10.vcxproj b/protocols/WhatsApp/WhatsApp_10.vcxproj
index 5d13b43b65..23e97e67b3 100644
--- a/protocols/WhatsApp/WhatsApp_10.vcxproj
+++ b/protocols/WhatsApp/WhatsApp_10.vcxproj
@@ -213,36 +213,28 @@
     <ClCompile Include="src\utils.cpp" />

     <ClCompile Include="src\WASocketConnection.cpp" />

     <ClCompile Include="src\WhatsAPI++\BinTreeNodeReader.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\BinTreeNodeWriter.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\ByteArray.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\FMessage.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\ProtocolTreeNode.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\utilities.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\WAConnection.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\WALogin.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

diff --git a/protocols/WhatsApp/WhatsApp_11.vcxproj b/protocols/WhatsApp/WhatsApp_11.vcxproj
index a6ee270054..a6b9560291 100644
--- a/protocols/WhatsApp/WhatsApp_11.vcxproj
+++ b/protocols/WhatsApp/WhatsApp_11.vcxproj
@@ -212,36 +212,28 @@
     <ClCompile Include="src\utils.cpp" />

     <ClCompile Include="src\WASocketConnection.cpp" />

     <ClCompile Include="src\WhatsAPI++\BinTreeNodeReader.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\BinTreeNodeWriter.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\ByteArray.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\FMessage.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\ProtocolTreeNode.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\utilities.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\WAConnection.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\WhatsAPI++\WALogin.cpp">

-      <PrecompiledHeaderFile>../common.h</PrecompiledHeaderFile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

diff --git a/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp b/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp
index 0cb8dd512b..866a94e702 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeReader.cpp
@@ -5,7 +5,6 @@
  *      Author: Antonio

  */

 

-#include "../common.h"

 #include "BinTreeNodeReader.h"

 #include "WAException.h"

 #include "ProtocolTreeNode.h"

diff --git a/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp b/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp
index 63428f7821..2c244d53b7 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/BinTreeNodeWriter.cpp
@@ -5,7 +5,6 @@
  *      Author: Antonio

  */

 

-#include "../common.h"

 #include "BinTreeNodeWriter.h"

 #include <cstring>

 #include "utilities.h"

diff --git a/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp b/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
index 5c7d16042e..c9117bcfee 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
@@ -5,7 +5,6 @@
  *      Author: Antonio

  */

 

-#include "../common.h"

 #include "ByteArray.h"

 #include "WAException.h"

 #include <iostream>

diff --git a/protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp b/protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp
index 03015e8e11..b8586eb538 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/FMessage.cpp
@@ -5,7 +5,6 @@
  *      Author: Antonio

  */

 

-#include "../common.h"

 #include <ctime>

 #include <stdlib.h>

 #include <algorithm>

diff --git a/protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp b/protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp
index c3c75cbd3e..be6a658acb 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/ProtocolTreeNode.cpp
@@ -5,7 +5,6 @@
  *      Author: Antonio

  */

 

-#include "../common.h"

 #include "WAException.h"

 #include "ProtocolTreeNode.h"

 

diff --git a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
index d1b4bf6a80..d5440d16f8 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp
@@ -5,13 +5,14 @@
  *      Author: Antonio

  */

 

-#include "../common.h"

 #include "WAConnection.h"

 #include "ProtocolTreeNode.h"

 #include <map>

 #include <vector>

 #include "utilities.h"

 

+std::string base64_encode(void*, size_t);

+

 const char* WAConnection::dictionary[] = {

 		"",

 		"",

@@ -1156,7 +1157,7 @@ void WAConnection::parseMessageInitialTagAlreadyChecked(ProtocolTreeNode* messag
 							data = childNode->getDataAsString();

 						} else {

 							_LOGDATA("Media data encoding type '%s'", (encoding == NULL? "text":encoding->c_str()));

-							data = (childNode->data == NULL? NULL : new std::string(mir_base64_encode((BYTE*)childNode->data->data(), (unsigned)childNode->data->size())));

+							data = (childNode->data == NULL? NULL : new std::string(base64_encode(childNode->data->data(), childNode->data->size())));

 						}

 						fmessage->data = (data == NULL? "": *data);

 						if (data != NULL)

@@ -1591,7 +1592,7 @@ std::string WAConnection::removeResourceFromJid(const std::string& jid) {
 }

 

 void WAConnection::sendStatusUpdate(std::string& status) throw (WAException) {

-	std::string id = this->makeId(Utilities::intToStr(time(NULL)));

+	std::string id = this->makeId(Utilities::intToStr((int)time(NULL)));

 	FMessage* message = new FMessage(new Key("s.us", true, id));

 	ProtocolTreeNode* body = new ProtocolTreeNode("body", NULL, new std::vector<unsigned char>(status.begin(), status.end()), NULL);

 	ProtocolTreeNode* messageNode = getMessageNode(message, body);

diff --git a/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp b/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
index 0a351300a9..37d5fe0378 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
@@ -5,7 +5,6 @@
  *      Author: Antonio

  */

 

-#include "../common.h"

 #include "WALogin.h"

 #include "ByteArray.h"

 //#include "ApplicationData.h"

diff --git a/protocols/WhatsApp/src/WhatsAPI++/utilities.cpp b/protocols/WhatsApp/src/WhatsAPI++/utilities.cpp
index ca87822a74..90d03dbdaa 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/utilities.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/utilities.cpp
@@ -1,5 +1,3 @@
-

-#include "../common.h"

 #include "utilities.h"

 //#include "ApplicationData.h"

 #include <iostream>

diff --git a/protocols/WhatsApp/src/connection.cpp b/protocols/WhatsApp/src/connection.cpp
index e5cb3b034f..6288d74ad9 100644
--- a/protocols/WhatsApp/src/connection.cpp
+++ b/protocols/WhatsApp/src/connection.cpp
@@ -142,7 +142,6 @@ void WhatsAppProto::stayConnectedLoop(void*)
 		ProtoBroadcastAck(0, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE) ID_STATUS_OFFLINE, m_iStatus);

 

 		CODE_BLOCK_TRY

-

 			unsigned passLen;

 			ptrA passBin((char*)mir_base64_decode(pass.c_str(), &passLen));

 			std::string password(passBin, passLen);

diff --git a/protocols/WhatsApp/src/utils.cpp b/protocols/WhatsApp/src/utils.cpp
index 8444cdd6f1..b78ef7f3b5 100644
--- a/protocols/WhatsApp/src/utils.cpp
+++ b/protocols/WhatsApp/src/utils.cpp
@@ -112,3 +112,8 @@ BYTE* utils::md5string(const BYTE *data, int size, BYTE *digest)
 	mir_md5_finish(&md5_state, digest);

 	return digest;

 }

+

+std::string base64_encode(void* pData, size_t len)

+{

+	return (char*)ptrA( mir_base64_encode((BYTE*)pData, (unsigned)len));

+}
\ No newline at end of file