- fix for 64-bit incompatibility;

- STL removed;
- copyright update;
- massive code cleaning;
- version bump

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

1 files changed, 3 insertions, 5 deletions

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index 6b870cfb76..4f5e5c3b49 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -6,6 +6,7 @@
 // Copyright © 2001-2002 Jon Keating, Richard Hughes

 // Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater

 // Copyright © 2004-2010 Joe Kucera, George Hazan

+// Copyright © 2012-2014 Miranda NG Team

 //

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License

@@ -20,13 +21,12 @@
 // You should have received a copy of the GNU General Public License

 // along with this program; if not, write to the Free Software

 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-//

 // -----------------------------------------------------------------------------

 //  DESCRIPTION:

 //

 //  Protocol Interface Implementation

-//

 // -----------------------------------------------------------------------------

+

 #include "icqoscar.h"

 

 #include "m_icolib.h"

@@ -76,6 +76,7 @@ CIcqProto::CIcqProto(const char* aProtoName, const TCHAR* aUserName) :
 	directConns(10, CompareConns),

 	expectedFileRecvs(10, CompareFT),

 	contactsCache(10, CompareContactsCache),

+	CustomCapList(1),

 	cheekySearchId(-1)

 {

 	debugLogA("Setting protocol/module name to '%s'", m_szModuleName);

@@ -210,7 +211,6 @@ CIcqProto::CIcqProto(const char* aProtoName, const TCHAR* aUserName) :
 	debugLogA("%s: Protocol instance '%s' created.", ICQ_PROTOCOL_NAME, m_szModuleName);

 }

 

-

 CIcqProto::~CIcqProto()

 {

 	m_bXStatusEnabled = 10; // block clist changing

@@ -238,8 +238,6 @@ CIcqProto::~CIcqProto()
 	// Clean-up remaining protocol instance members

 	UninitContactsCache();

 

-	CustomCapList.clear();

-

 	SAFE_DELETE(&m_ratesMutex);

 

 	SAFE_DELETE(&servlistMutex);