- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

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

16 files changed, 31 insertions, 31 deletions

diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp
index a8f6dd53e8..4158368e9f 100644
--- a/plugins/SendScreenshotPlus/src/CSend.cpp
+++ b/plugins/SendScreenshotPlus/src/CSend.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "global.h"
 
 //---------------------------------------------------------------------------
-CSend::CSend(HWND Owner, HANDLE hContact, bool bFreeOnExit) {
+CSend::CSend(HWND Owner, HCONTACT hContact, bool bFreeOnExit) {
 	m_hWndO			= Owner;
 	m_bFreeOnExit	= bFreeOnExit;
 	m_pszFile		= NULL;
@@ -59,7 +59,7 @@ CSend::~CSend(){
 }
 
 //---------------------------------------------------------------------------
-void CSend::SetContact(HANDLE hContact) {
+void CSend::SetContact(HCONTACT hContact) {
 	m_hContact		= hContact;
 	m_pszProto		= GetContactProto(hContact);
 	m_ChatRoom		= db_get_b(hContact, m_pszProto, "ChatRoom", 0);
@@ -145,7 +145,7 @@ void	CSend::svcSendChat() {
 	gci.pszModule = m_pszProto;
 	for (int i = 0; i < cnt ; i++ ) {
 		gci.iItem = i;
-		gci.Flags = BYINDEX | HCONTACT | ID;
+		gci.Flags = GCF_BYINDEX | GCF_HCONTACT | GCF_ID;
 		CallService(MS_GC_GETINFO, 0, (LPARAM)&gci);
 		if (gci.hContact == m_hContact) {
 			GCDEST gcd = { m_pszProto, gci.pszID, GC_EVENT_SENDMESSAGE };
diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h
index 6e65252919..cdd12a5393 100644
--- a/plugins/SendScreenshotPlus/src/CSend.h
+++ b/plugins/SendScreenshotPlus/src/CSend.h
@@ -48,13 +48,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //---------------------------------------------------------------------------
 class CSend {
 	public:
-		CSend(HWND Owner, HANDLE hContact, bool bFreeOnExit); // oder (TfrmMain & Owner)
+		CSend(HWND Owner, HCONTACT hContact, bool bFreeOnExit); // oder (TfrmMain & Owner)
 		virtual ~CSend();
 
 		virtual void	Send() = 0;
 //		void			SendSync(bool Sync) {m_SendSync = Sync;};
 		bool			m_bFreeOnExit;		// need to "delete object;" on exit ?
-		void			SetContact(HANDLE hContact);
+		void			SetContact(HCONTACT hContact);
 		BYTE			GetEnableItem() {return m_EnableItem;};
 		LPTSTR			GetErrorMsg() {return m_ErrorMsg;};
 
@@ -66,14 +66,13 @@ class CSend {
 	private:
 
 	protected:
-		LPTSTR			m_pszSendTyp;		//hold string for error mess
-		HWND			m_hWndO;			//window handle of caller
-		HANDLE			m_hContact;			//Contact handle
-		char*			m_pszProto;			//Contact Proto Modul
-		BYTE			m_EnableItem;		//hold flag for send type
-		void			AfterSendDelete();
-		BYTE			m_ChatRoom;			//is Contact chatroom
-//		bool			m_SendSync;			//send sync / async
+		LPTSTR   m_pszSendTyp;		//hold string for error mess
+		HWND     m_hWndO;			//window handle of caller
+		HCONTACT	m_hContact;			//Contact handle
+		char    *m_pszProto;			//Contact Proto Modul
+		BYTE     m_EnableItem;		//hold flag for send type
+		BYTE     m_ChatRoom;			//is Contact chatroom
+		void AfterSendDelete();
 
 		bool			hasCap(unsigned int Flag);
 		unsigned int	m_PFflag;
diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
index c7f216b454..778c28390c 100644
--- a/plugins/SendScreenshotPlus/src/CSendEmail.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "global.h"
 
 //---------------------------------------------------------------------------
-CSendEmail::CSendEmail(HWND Owner, HANDLE hContact, bool bFreeOnExit)
+CSendEmail::CSendEmail(HWND Owner, HCONTACT hContact, bool bFreeOnExit)
 : CSend(Owner, hContact, bFreeOnExit){
 	m_EnableItem		= SS_DLG_DELETEAFTERSSEND | SS_DLG_DESCRIPTION; // SS_DLG_AUTOSEND | ;
 	m_pszSendTyp		= _T("Email transfer");
diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.h b/plugins/SendScreenshotPlus/src/CSendEmail.h
index 35e2372fc9..bfd51da9ce 100644
--- a/plugins/SendScreenshotPlus/src/CSendEmail.h
+++ b/plugins/SendScreenshotPlus/src/CSendEmail.h
@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 class CSendEmail : public CSend {

 	public:

 		// Deklaration Standardkonstruktor/Standarddestructor

-		CSendEmail(HWND Owner, HANDLE hContact, bool bFreeOnExit);

+		CSendEmail(HWND Owner, HCONTACT hContact, bool bFreeOnExit);

 		~CSendEmail();

 

 		void					Send();

diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
index 355ea225ad..f7a4661261 100644
--- a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 

 

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

-CSendFTPFile::CSendFTPFile(HWND Owner, HANDLE hContact, bool bFreeOnExit)

+CSendFTPFile::CSendFTPFile(HWND Owner, HCONTACT hContact, bool bFreeOnExit)

 : CSend(Owner, hContact, bFreeOnExit){

 	m_EnableItem		= NULL ; //SS_DLG_DESCRIPTION| SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND;

 	m_pszSendTyp		= LPGENT("FTPFile transfer");

diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.h b/plugins/SendScreenshotPlus/src/CSendFTPFile.h
index 9fa83e0481..11eaabb3e0 100644
--- a/plugins/SendScreenshotPlus/src/CSendFTPFile.h
+++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.h
@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 class CSendFTPFile : public CSend {

 	public:

 		// Deklaration Standardkonstruktor/Standarddestructor

-		CSendFTPFile(HWND Owner, HANDLE hContact, bool bFreeOnExit);

+		CSendFTPFile(HWND Owner, HCONTACT hContact, bool bFreeOnExit);

 		~CSendFTPFile();

 

 		void					Send();

diff --git a/plugins/SendScreenshotPlus/src/CSendFile.cpp b/plugins/SendScreenshotPlus/src/CSendFile.cpp
index 34489fbe1d..0453d581c0 100644
--- a/plugins/SendScreenshotPlus/src/CSendFile.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendFile.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "global.h"

 

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

-CSendFile::CSendFile(HWND Owner, HANDLE hContact, bool bFreeOnExit)

+CSendFile::CSendFile(HWND Owner, HCONTACT hContact, bool bFreeOnExit)

 : CSend(Owner, hContact, bFreeOnExit){

 	m_EnableItem		= SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND | SS_DLG_DESCRIPTION;

 	m_pszSendTyp		= _T("File transfer");

diff --git a/plugins/SendScreenshotPlus/src/CSendFile.h b/plugins/SendScreenshotPlus/src/CSendFile.h
index 1476c58c14..07877cdac8 100644
--- a/plugins/SendScreenshotPlus/src/CSendFile.h
+++ b/plugins/SendScreenshotPlus/src/CSendFile.h
@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 class CSendFile : public CSend {

 	public:

 		// Deklaration Standardkonstruktor/Standarddestructor

-		CSendFile(HWND Owner, HANDLE hContact, bool bFreeOnExit);

+		CSendFile(HWND Owner, HCONTACT hContact, bool bFreeOnExit);

 		~CSendFile();

 

 		void			Send();

diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
index af3f4f277f..cdc146b0e9 100644
--- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
@@ -34,7 +34,7 @@ INT_PTR (*g_MirCallService)(const char *, WPARAM, LPARAM)=NULL;
 
 
 //---------------------------------------------------------------------------
-CSendHTTPServer::CSendHTTPServer(HWND Owner, HANDLE hContact, bool bFreeOnExit)
+CSendHTTPServer::CSendHTTPServer(HWND Owner, HCONTACT hContact, bool bFreeOnExit)
 : CSend(Owner, hContact, bFreeOnExit){
 	m_EnableItem		= SS_DLG_DESCRIPTION ; //| SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND;
 	m_pszSendTyp		= _T("HTTPServer transfer");
diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h
index d8b2209aa0..740be3edf6 100644
--- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h
@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 class CSendHTTPServer : public CSend {
 	public:
 		// Deklaration Standardkonstruktor/Standarddestructor
-		CSendHTTPServer(HWND Owner, HANDLE hContact, bool bFreeOnExit);
+		CSendHTTPServer(HWND Owner, HCONTACT hContact, bool bFreeOnExit);
 		~CSendHTTPServer();
 
 		void					Send();
diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
index 54608e6d35..68f91bbdc1 100644
--- a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "global.h"
 
 //---------------------------------------------------------------------------
-CSendImageShack::CSendImageShack(HWND Owner, HANDLE hContact, bool bFreeOnExit)
+CSendImageShack::CSendImageShack(HWND Owner, HCONTACT hContact, bool bFreeOnExit)
 : CSend(Owner, hContact, bFreeOnExit) {
 	m_EnableItem		= SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND | SS_DLG_DESCRIPTION;
 	m_pszSendTyp		= _T("Image upload");
diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.h b/plugins/SendScreenshotPlus/src/CSendImageShack.h
index c7ee7e1e15..6ab5670c7c 100644
--- a/plugins/SendScreenshotPlus/src/CSendImageShack.h
+++ b/plugins/SendScreenshotPlus/src/CSendImageShack.h
@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 class CSendImageShack : public CSend {
 	public:
 		// Deklaration Standardkonstruktor/Standarddestructor
-		CSendImageShack(HWND Owner, HANDLE hContact, bool bFreeOnExit);
+		CSendImageShack(HWND Owner, HCONTACT hContact, bool bFreeOnExit);
 		~CSendImageShack();
 
 		void					Send();
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 3df0ba8f66..9ad59587ef 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -210,7 +210,7 @@ INT_PTR service_CaptureAndSendDesktop(WPARAM wParam, LPARAM lParam) {
 		delete frmMain;
 		return -1;
 	}
-	HANDLE hContact = (HANDLE) wParam;
+	HCONTACT hContact = (HCONTACT) wParam;
 	LPSTR  pszProto = GetContactProto(hContact);
 	bool bChatRoom = db_get_b(hContact, pszProto, "ChatRoom", 0) != 0;
 	frmMain->m_opt_chkTimed			= false;
@@ -239,7 +239,7 @@ INT_PTR service_OpenCaptureDialog(WPARAM wParam, LPARAM lParam){
 		delete frmMain;
 		return -1;
 	}
-	frmMain->Init(pszPath,(HANDLE)wParam);
+	frmMain->Init(pszPath, (HCONTACT)wParam);
 	mir_free(pszPath);
 	if(lParam==0xFFFF){
 		frmMain->SetTargetWindow(NULL);
@@ -276,7 +276,7 @@ INT_PTR service_EditBitmap(WPARAM wParam, LPARAM lParam) {
 // lParam = (HANDLE)contact (can be null)
 INT_PTR service_Send2ImageShack(WPARAM wParam, LPARAM lParam) {
 	LPSTR result = NULL;
-	CSendImageShack* cSend = new CSendImageShack(NULL, (HANDLE)lParam, false);
+	CSendImageShack* cSend = new CSendImageShack(NULL, (HCONTACT)lParam, false);
 	cSend->m_pszFile = mir_a2t((char*)wParam);
 	cSend->m_bDeleteAfterSend = FALSE;
 	if (lParam != NULL) {
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index d7d058df1c..4be9eabbaa 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -764,7 +764,7 @@ void TfrmMain::SaveOptions(void) {
 }
 
 //---------------------------------------------------------------------------
-void TfrmMain::Init(LPTSTR DestFolder, HANDLE Contact) {
+void TfrmMain::Init(LPTSTR DestFolder, HCONTACT Contact) {
 	m_FDestFolder = mir_tstrdup(DestFolder);
 	m_hContact = Contact;
 	if(!m_hContact) m_opt_cboxSendBy = SS_JUSTSAVE;
@@ -775,7 +775,8 @@ void TfrmMain::Init(LPTSTR DestFolder, HANDLE Contact) {
 	_HandleMapping.insert(CHandleMapping::value_type(m_hWnd, this));
 
 	//check Contact
-	if(m_cSend) m_cSend->SetContact(Contact);
+	if(m_cSend)
+		m_cSend->SetContact(Contact);
 }
 
 //---------------------------------------------------------------------------
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.h b/plugins/SendScreenshotPlus/src/UMainForm.h
index cf6c827c4e..7e5029aa15 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.h
+++ b/plugins/SendScreenshotPlus/src/UMainForm.h
@@ -69,7 +69,7 @@ class TfrmMain{
 		bool		m_bOnExitSave;
 
 		static void Unload();
-		void		Init(LPTSTR DestFolder, HANDLE Contact);
+		void		Init(LPTSTR DestFolder, HCONTACT Contact);
 		void		Close(){SendMessage(m_hWnd,WM_CLOSE,0,0);}
 		void		Show(){ShowWindow(m_hWnd,SW_SHOW);}
 		void		Hide(){ShowWindow(m_hWnd,SW_HIDE);}
@@ -79,7 +79,7 @@ class TfrmMain{
 
 	private:
 		HWND		m_hWnd;
-		HANDLE		m_hContact;
+		HCONTACT	m_hContact;
 		bool		m_bDeleteAfterSend;
 		bool		m_bFormAbout, m_bFormEdit;
 		HWND		m_hTargetWindow, m_hLastWin;
diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
index b73d3d5fa7..e32f22d332 100644
--- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
+++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
@@ -691,7 +691,7 @@ LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 /**

  * This is the service function for external plugins to use the nice messagebox

  *

- * @param	wParam		- HANDLE hContact which can display an avatar for popups

+ * @param	wParam		- HCONTACT hContact which can display an avatar for popups

  * @param	lParam		- MSGBOX structure holding parameters

  *

  * @return	The function returns the ID of the clicked button (IDOK, IDCANCEL, ...)