1 files changed, 46 insertions, 46 deletions

diff --git a/plugins/SmileyAdd/src/smileys.h b/plugins/SmileyAdd/src/smileys.h
index cba4999442..c69d128618 100644
--- a/plugins/SmileyAdd/src/smileys.h
+++ b/plugins/SmileyAdd/src/smileys.h
@@ -42,7 +42,7 @@ protected:
 	HICON m_SmileyIcon;

 	ImageBase *m_xepimg;

 

-	CMString m_filepath;

+	CMStringW m_filepath;

 

 	void SetFlagsBit(unsigned flag, bool set)

 	{

@@ -51,17 +51,17 @@ protected:
 

 public:

 

-	CMString m_TriggerText;

-	CMString m_ToolText;

-	CMString m_InsertText;

+	CMStringW m_TriggerText;

+	CMStringW m_ToolText;

+	CMStringW m_InsertText;

 

 	SmileyType();

 	~SmileyType();

 

-	const CMString& GetTriggerText(void) const { return m_TriggerText; }

-	const CMString& GetToolText(void) const { return m_ToolText; }

-	const CMString& GetInsertText(void) const { return m_InsertText; }

-	const CMString& GetFilePath(void) const { return m_filepath; }

+	const CMStringW& GetTriggerText(void) const { return m_TriggerText; }

+	const CMStringW& GetToolText(void) const { return m_ToolText; }

+	const CMStringW& GetInsertText(void) const { return m_InsertText; }

+	const CMStringW& GetFilePath(void) const { return m_filepath; }

 

 	bool IsHidden(void) const { return (m_flags & HiddenSmiley) != 0; }

 	bool IsRegEx(void) const { return (m_flags & RegExSmiley) != 0; }

@@ -96,7 +96,7 @@ public:
 

 	void SetImList(HIMAGELIST hImLst, long i);

 

-	bool LoadFromResource(const CMString &file, const int index);

+	bool LoadFromResource(const CMStringW &file, const int index);

 	bool LoadFromImage(IStream *pStream);

 };

 

@@ -133,7 +133,7 @@ private:
 	_TPattern *m_pattern;

 

 	int m_ind;

-	CMString m_text;

+	CMStringW m_text;

 	bool m_valid;

 

 public:

@@ -146,10 +146,10 @@ public:
 	typedef SMOBJLIST<SmileyLocType> SmileyLocVecType;

 

 	SmileyLookup() { m_ind = 0; m_valid = false; m_pattern = NULL; };

-	SmileyLookup(const CMString &str, const bool regexs, const int ind, const CMString &smpt);

+	SmileyLookup(const CMStringW &str, const bool regexs, const int ind, const CMStringW &smpt);

 	~SmileyLookup();

 

-	void Find(const CMString &str, SmileyLocVecType &smlcur, bool firstOnly) const;

+	void Find(const CMStringW &str, SmileyLocVecType &smlcur, bool firstOnly) const;

 	int GetIndex(void) const { return m_ind; }

 	bool IsValid(void) const { return m_valid; }

 };

@@ -164,12 +164,12 @@ public:
 	POINT selec, win;

 

 private:

-	CMString m_Filename;  //used as identification

-	CMString m_Name;

-	CMString m_Author;

-	CMString m_Date;

-	CMString m_Version;

-	CMString m_ButtonSmiley;

+	CMStringW m_Filename;  //used as identification

+	CMStringW m_Name;

+	CMStringW m_Author;

+	CMStringW m_Date;

+	CMStringW m_Version;

+	CMStringW m_ButtonSmiley;

 

 	HIMAGELIST m_hSmList;

 

@@ -181,9 +181,9 @@ private:
 	bool errorFound;

 

 	void AddTriggersToSmileyLookup(void);

-	void ReplaceAllSpecials(const CMString &Input, CMString &Output);

-	bool LoadSmileyFileMSL(CMString &tbuf, bool onlyInfo, CMString &modpath);

-	bool LoadSmileyFileXEP(CMString &tbuf, bool onlyInfo, CMString &modpath);

+	void ReplaceAllSpecials(const CMStringW &Input, CMStringW &Output);

+	bool LoadSmileyFileMSL(CMStringW &tbuf, bool onlyInfo, CMStringW &modpath);

+	bool LoadSmileyFileXEP(CMStringW &tbuf, bool onlyInfo, CMStringW &modpath);

 

 public:

 	SmileyPackType();

@@ -192,11 +192,11 @@ public:
 	SmileyVectorType& GetSmileyList(void) { return m_SmileyList; }

 	SmileyLookupType* GetSmileyLookup(void) { return &m_SmileyLookup; }

 

-	const CMString& GetFilename(void) const { return m_Filename; }

-	const CMString& GetName(void) const { return m_Name; }

-	const CMString& GetAuthor(void) const { return m_Author; }

-	const CMString& GetDate(void) const { return m_Date; }

-	const CMString& GetVersion(void) const { return m_Version; }

+	const CMStringW& GetFilename(void) const { return m_Filename; }

+	const CMStringW& GetName(void) const { return m_Name; }

+	const CMStringW& GetAuthor(void) const { return m_Author; }

+	const CMStringW& GetDate(void) const { return m_Date; }

+	const CMStringW& GetVersion(void) const { return m_Version; }

 

 	int SmileyCount(void) const { return m_SmileyList.getCount(); }

 	int VisibleSmileyCount(void) const { return m_VisibleCount; }

@@ -205,7 +205,7 @@ public:
 

 	const wchar_t* GetButtonSmiley(void) const { return m_ButtonSmiley.c_str(); }

 

-	bool LoadSmileyFile(const CMString &filename, const CMString &packname, bool onlyInfo, bool noerr = false);

+	bool LoadSmileyFile(const CMStringW &filename, const CMStringW &packname, bool onlyInfo, bool noerr = false);

 

 	void Clear(void);

 };

@@ -222,9 +222,9 @@ private:
 public:

 	int NumberOfSmileyPacks(void) { return m_SmileyPacks.getCount(); }

 

-	bool AddSmileyPack(CMString &filename, CMString &packname);

+	bool AddSmileyPack(CMStringW &filename, CMStringW &packname);

 	void ClearAndFreeAll(void);

-	SmileyPackType* GetSmileyPack(CMString& filename);

+	SmileyPackType* GetSmileyPack(CMStringW& filename);

 };

 

 

@@ -244,9 +244,9 @@ typedef enum
 class SmileyCategoryType

 {

 private:

-	CMString m_Name;

-	CMString m_DisplayName;

-	CMString m_Filename;     //functions as identification 

+	CMStringW m_Name;

+	CMStringW m_DisplayName;

+	CMStringW m_Filename;     //functions as identification 

 

 	SmcType type;

 

@@ -256,11 +256,11 @@ private:
 

 public:

 	SmileyCategoryType() { type = smcNone; m_pSmileyPackStore = NULL; visible = true; };

-	SmileyCategoryType(SmileyPackListType *pSPS, const CMString &name, const CMString &displayName, const CMString &defaultFilename, SmcType typ);

+	SmileyCategoryType(SmileyPackListType *pSPS, const CMStringW &name, const CMStringW &displayName, const CMStringW &defaultFilename, SmcType typ);

 

-	const CMString& GetDisplayName(void) const { return m_DisplayName; }

-	const CMString& GetName(void) const { return m_Name; }

-	const CMString& GetFilename(void) const { return m_Filename; }

+	const CMStringW& GetDisplayName(void) const { return m_DisplayName; }

+	const CMStringW& GetName(void) const { return m_Name; }

+	const CMStringW& GetFilename(void) const { return m_Filename; }

 

 	bool IsCustom(void) { return type == smcCustom; }

 	bool IsProto(void) { return type == smcProto || type == smcPhysProto || type == smcTransportProto || type == smcVirtualProto; }

@@ -275,8 +275,8 @@ public:
 

 	SmileyPackType* GetSmileyPack(void);

 

-	void SetFilename(CMString& name) { m_Filename = name; }

-	void SetDisplayName(CMString& name) { m_DisplayName = name; }

+	void SetFilename(CMStringW& name) { m_Filename = name; }

+	void SetDisplayName(CMStringW& name) { m_DisplayName = name; }

 	void SetVisible(bool vis) { visible = vis; }

 

 	void ClearFilename(void) { m_Filename.Empty(); }

@@ -298,20 +298,20 @@ private:
 public:

 	void SetSmileyPackStore(SmileyPackListType *pSPS) { m_pSmileyPackStore = pSPS; }

 

-	SmileyCategoryType* GetSmileyCategory(const CMString& name);

+	SmileyCategoryType* GetSmileyCategory(const CMStringW& name);

 	SmileyCategoryType* GetSmileyCategory(unsigned index);

-	SmileyPackType* GetSmileyPack(CMString& name);

+	SmileyPackType* GetSmileyPack(CMStringW& name);

 	SmileyCategoryVectorType* GetSmileyCategoryList(void) { return &m_SmileyCategories; };

 

 	int NumberOfSmileyCategories(void) { return m_SmileyCategories.getCount(); }

 

-	void AddCategory(const CMString& name, const CMString& displayName, SmcType typ,

-		const CMString& defaultFilename = CMString(L"Smileys\\nova\\default.msl"));

-	void AddAndLoad(const CMString& name, const CMString& displayName);

+	void AddCategory(const CMStringW& name, const CMStringW& displayName, SmcType typ,

+		const CMStringW& defaultFilename = CMStringW(L"Smileys\\nova\\default.msl"));

+	void AddAndLoad(const CMStringW& name, const CMStringW& displayName);

 	void AddAllProtocolsAsCategory(void);

-	void AddAccountAsCategory(PROTOACCOUNT *acc, const CMString& defaultFile);

-	void AddProtoAsCategory(char *acc, const CMString& defaultFile);

-	void AddContactTransportAsCategory(MCONTACT hContact, const CMString& defaultFile);

+	void AddAccountAsCategory(PROTOACCOUNT *acc, const CMStringW& defaultFile);

+	void AddProtoAsCategory(char *acc, const CMStringW& defaultFile);

+	void AddContactTransportAsCategory(MCONTACT hContact, const CMStringW& defaultFile);

 

 	void ClearAndLoadAll(void);

 	void ClearAll(void)