attempt to wipe out STL from extra icons

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

1 files changed, 3 insertions, 16 deletions

diff --git a/src/modules/extraicons/ExtraIcon.h b/src/modules/extraicons/ExtraIcon.h
index ca92cd659c..8b2a7a56ae 100644
--- a/src/modules/extraicons/ExtraIcon.h
+++ b/src/modules/extraicons/ExtraIcon.h
@@ -22,9 +22,6 @@ Boston, MA 02111-1307, USA.
 #ifndef __EXTRAICON_H__

 #define __EXTRAICON_H__

 

-#include <string>

-#include <vector>

-

 #define EXTRAICON_TYPE_GROUP -1

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -58,16 +55,6 @@ public:
 

 	virtual bool isEnabled() const;

 

-	/// @retun <0 if this < other, 0 if this == other, >0 if this > other

-	virtual int compare(const ExtraIcon *other) const;

-

-	bool operator==(const ExtraIcon &other) const;

-	bool operator!=(const ExtraIcon &other) const;

-	bool operator<(const ExtraIcon &other) const;

-	bool operator<=(const ExtraIcon &other) const;

-	bool operator>(const ExtraIcon &other) const;

-	bool operator>=(const ExtraIcon &other) const;

-

 	virtual int ClistSetExtraIcon(HANDLE hContact, HANDLE hImage) = 0;

 

 	int hLangpack;

@@ -102,8 +89,8 @@ public:
 

 protected:

 	int id;

-	std::tstring description;

-	std::string descIcon;

+	ptrT tszDescription;

+	ptrA szDescIcon;

 	MIRANDAHOOKPARAM OnClick;

 	LPARAM onClickParam;

 };

@@ -183,7 +170,7 @@ public:
 	virtual int ClistSetExtraIcon(HANDLE hContact, HANDLE hImage);

 

 protected:

-	std::tstring description;

+	ptrT tszDescription;

 	bool setValidExtraIcon;

 	bool insideApply;