mTextControl: code cleaning + stronger types

1 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Popup/src/popup_wnd2.h b/plugins/Popup/src/popup_wnd2.h
index 7f381684ac..b72f2e3920 100644
--- a/plugins/Popup/src/popup_wnd2.h
+++ b/plugins/Popup/src/popup_wnd2.h
@@ -54,13 +54,13 @@ private:
 

 	// content

 	TextType    m_textType;

-	wchar_t      *m_lptzTitle, *m_lptzText;

-	HANDLE      m_mtTitle, m_mtText;

+	wchar_t    *m_lptzTitle, *m_lptzText;

+	HText       m_mtTitle, m_mtText;

 	bool        m_bTextEmpty, m_bIcoLib;

 	HFONT       m_hfnTitle, m_hfnText;

 	HICON       m_hIcon;

 	HBITMAP     m_hbmAvatar;

-	wchar_t       m_time[2 + 1 + 2 + 1];

+	wchar_t     m_time[2 + 1 + 2 + 1];

 	ActionInfo* m_actions;

 	int         m_actionCount;

 	HANDLE      m_hNotification;

@@ -146,15 +146,15 @@ public:
 	bool     isTextEmpty()      { return m_bTextEmpty; }

 	bool     isIcolib()         { return m_bIcoLib; }

 	TextType getTextType()      { return m_textType; }

-	wchar_t   *getText()          { return m_lptzText; }

-	HANDLE   getTextM()         { return m_mtText; }

-	wchar_t   *getTitle()         { return m_lptzTitle; }

-	HANDLE   getTitleM()        { return m_mtTitle; }

+	wchar_t *getText()          { return m_lptzText; }

+	HText    getTextM()         { return m_mtText; }

+	wchar_t *getTitle()         { return m_lptzTitle; }

+	HText    getTitleM()        { return m_mtTitle; }

 

 	int      getActionCount()   { return m_actionCount; }

 	ActionInfo *getActions()    { return m_actions; }

 

-	wchar_t   *getTime()          { return m_time; }

+	wchar_t *getTime()          { return m_time; }

 	HICON    getIcon()          { return m_hIcon; }

 	MCONTACT getContact()       { return m_hContact; }

 	MCONTACT getContactPassed() { return m_hContactPassed; }