summaryrefslogtreecommitdiff
path: root/plugins/SendScreenshotPlus
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/SendScreenshotPlus')
-rw-r--r--plugins/SendScreenshotPlus/src/CSend.cpp4
-rw-r--r--plugins/SendScreenshotPlus/src/CSend.h6
-rw-r--r--plugins/SendScreenshotPlus/src/CSendEmail.cpp2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendEmail.h2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendFTPFile.cpp2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendFTPFile.h2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendFile.cpp2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendFile.h2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendHTTPServer.h2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendImageShack.cpp2
-rw-r--r--plugins/SendScreenshotPlus/src/CSendImageShack.h2
-rw-r--r--plugins/SendScreenshotPlus/src/Main.cpp6
-rw-r--r--plugins/SendScreenshotPlus/src/UMainForm.cpp2
-rw-r--r--plugins/SendScreenshotPlus/src/UMainForm.h4
-rw-r--r--plugins/SendScreenshotPlus/src/dlg_msgbox.cpp2
16 files changed, 22 insertions, 22 deletions
diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp
index 4158368e9f..793a9ecca7 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, HCONTACT hContact, bool bFreeOnExit) {
+CSend::CSend(HWND Owner, MCONTACT hContact, bool bFreeOnExit) {
m_hWndO = Owner;
m_bFreeOnExit = bFreeOnExit;
m_pszFile = NULL;
@@ -59,7 +59,7 @@ CSend::~CSend(){
}
//---------------------------------------------------------------------------
-void CSend::SetContact(HCONTACT hContact) {
+void CSend::SetContact(MCONTACT hContact) {
m_hContact = hContact;
m_pszProto = GetContactProto(hContact);
m_ChatRoom = db_get_b(hContact, m_pszProto, "ChatRoom", 0);
diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h
index cdd12a5393..9026f72fe7 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, HCONTACT hContact, bool bFreeOnExit); // oder (TfrmMain & Owner)
+ CSend(HWND Owner, MCONTACT 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(HCONTACT hContact);
+ void SetContact(MCONTACT hContact);
BYTE GetEnableItem() {return m_EnableItem;};
LPTSTR GetErrorMsg() {return m_ErrorMsg;};
@@ -68,7 +68,7 @@ class CSend {
protected:
LPTSTR m_pszSendTyp; //hold string for error mess
HWND m_hWndO; //window handle of caller
- HCONTACT m_hContact; //Contact handle
+ MCONTACT m_hContact; //Contact handle
char *m_pszProto; //Contact Proto Modul
BYTE m_EnableItem; //hold flag for send type
BYTE m_ChatRoom; //is Contact chatroom
diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
index 778c28390c..9b6498ecb8 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, HCONTACT hContact, bool bFreeOnExit)
+CSendEmail::CSendEmail(HWND Owner, MCONTACT 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 bfd51da9ce..5406ad08d4 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, HCONTACT hContact, bool bFreeOnExit);
+ CSendEmail(HWND Owner, MCONTACT hContact, bool bFreeOnExit);
~CSendEmail();
void Send();
diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
index f7a4661261..ac2d7cef02 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, HCONTACT hContact, bool bFreeOnExit)
+CSendFTPFile::CSendFTPFile(HWND Owner, MCONTACT 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 11eaabb3e0..99901a862b 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, HCONTACT hContact, bool bFreeOnExit);
+ CSendFTPFile(HWND Owner, MCONTACT hContact, bool bFreeOnExit);
~CSendFTPFile();
void Send();
diff --git a/plugins/SendScreenshotPlus/src/CSendFile.cpp b/plugins/SendScreenshotPlus/src/CSendFile.cpp
index 0453d581c0..4fce2dc7bf 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, HCONTACT hContact, bool bFreeOnExit)
+CSendFile::CSendFile(HWND Owner, MCONTACT 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 07877cdac8..5e484c6973 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, HCONTACT hContact, bool bFreeOnExit);
+ CSendFile(HWND Owner, MCONTACT hContact, bool bFreeOnExit);
~CSendFile();
void Send();
diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
index cdc146b0e9..155ad79393 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, HCONTACT hContact, bool bFreeOnExit)
+CSendHTTPServer::CSendHTTPServer(HWND Owner, MCONTACT 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 740be3edf6..85ad17c8d6 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, HCONTACT hContact, bool bFreeOnExit);
+ CSendHTTPServer(HWND Owner, MCONTACT hContact, bool bFreeOnExit);
~CSendHTTPServer();
void Send();
diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
index 68f91bbdc1..2af40a8740 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, HCONTACT hContact, bool bFreeOnExit)
+CSendImageShack::CSendImageShack(HWND Owner, MCONTACT 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 6ab5670c7c..b8f3623d61 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, HCONTACT hContact, bool bFreeOnExit);
+ CSendImageShack(HWND Owner, MCONTACT hContact, bool bFreeOnExit);
~CSendImageShack();
void Send();
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 9ad59587ef..2801e4ae5d 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;
}
- HCONTACT hContact = (HCONTACT) wParam;
+ MCONTACT hContact = (MCONTACT) 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, (HCONTACT)wParam);
+ frmMain->Init(pszPath, (MCONTACT)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, (HCONTACT)lParam, false);
+ CSendImageShack* cSend = new CSendImageShack(NULL, (MCONTACT)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 4be9eabbaa..0ee9533ce9 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, HCONTACT Contact) {
+void TfrmMain::Init(LPTSTR DestFolder, MCONTACT Contact) {
m_FDestFolder = mir_tstrdup(DestFolder);
m_hContact = Contact;
if(!m_hContact) m_opt_cboxSendBy = SS_JUSTSAVE;
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.h b/plugins/SendScreenshotPlus/src/UMainForm.h
index 7e5029aa15..934340ace0 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, HCONTACT Contact);
+ void Init(LPTSTR DestFolder, MCONTACT 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;
- HCONTACT m_hContact;
+ MCONTACT 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 e32f22d332..393772ca5e 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 - HCONTACT hContact which can display an avatar for popups
+ * @param wParam - MCONTACT 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, ...)