summaryrefslogtreecommitdiff
path: root/plugins/FloatingContacts
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/FloatingContacts')
-rw-r--r--plugins/FloatingContacts/src/fltcont.h2
-rw-r--r--plugins/FloatingContacts/src/main.cpp32
-rw-r--r--plugins/FloatingContacts/src/thumbs.cpp4
-rw-r--r--plugins/FloatingContacts/src/thumbs.h6
4 files changed, 22 insertions, 22 deletions
diff --git a/plugins/FloatingContacts/src/fltcont.h b/plugins/FloatingContacts/src/fltcont.h
index c4e98ab498..d7d1a12bb6 100644
--- a/plugins/FloatingContacts/src/fltcont.h
+++ b/plugins/FloatingContacts/src/fltcont.h
@@ -140,7 +140,7 @@ static __forceinline BOOL ImageList_GetIconSize_my(HIMAGELIST himl, SIZE &sz)
return res;
}
-void RegHotkey ( HANDLE hContact, HWND hwnd );
+void RegHotkey ( HCONTACT hContact, HWND hwnd );
BOOL IsStatusVisible ( int status );
BOOL HideOnFullScreen ();
void SendMsgDialog ( HWND hwnd, TCHAR *pText );
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index 9e2892a204..17e2cb089e 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -22,18 +22,18 @@ No warranty for any misbehaviour.
// TODO: move to some more approriate place, probably part of Thumbs manager
static void LoadContacts(void);
-static void LoadContact(HANDLE hContact);
+static void LoadContact(HCONTACT hContact);
// Internal funcs
static void RepaintWindow(HWND hwnd, HDC hdc);
static void LoadMenus();
-static void CreateThumbWnd(TCHAR *ptszName, HANDLE hContact, int nX, int nY);
+static void CreateThumbWnd(TCHAR *ptszName, HCONTACT hContact, int nX, int nY);
static void RegisterWindowClass(void);
static void UnregisterWindowClass(void);
static void LoadDBSettings(void);
static void CreateThumbsFont(void);
static void CreateBackgroundBrush(void);
-static int GetContactStatus(HANDLE hContact);
+static int GetContactStatus(HCONTACT hContact);
static void GetScreenRect(void);
extern void SetThumbsOpacity(BYTE btAlpha);
static int ClcStatusToPf2(int status);
@@ -136,7 +136,7 @@ static LPCTSTR s_fonts[FLT_FONTIDS] =
static int OnContactDeleted(WPARAM wParam, LPARAM lParam)
{
- HANDLE hContact = (HANDLE)wParam;
+ HCONTACT hContact = (HCONTACT)wParam;
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb) {
pThumb->DeleteContactPos();
@@ -147,7 +147,7 @@ static int OnContactDeleted(WPARAM wParam, LPARAM lParam)
static int OnContactIconChanged(WPARAM wParam, LPARAM lParam)
{
- HANDLE hContact = (HANDLE)wParam;
+ HCONTACT hContact = (HCONTACT)wParam;
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb) {
pThumb->RefreshContactIcon((int)lParam);
@@ -163,7 +163,7 @@ static int OnContactDrag(WPARAM wParam, LPARAM lParam)
POINT pt;
GetCursorPos(&pt);
- HANDLE hContact = (HANDLE)wParam;
+ HCONTACT hContact = (HCONTACT)wParam;
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb == NULL) {
int idStatus = GetContactStatus(hContact);
@@ -188,7 +188,7 @@ static int OnContactDrop(WPARAM wParam, LPARAM lParam)
RECT rcMiranda;
RECT rcThumb;
- HANDLE hContact = (HANDLE)wParam;
+ HCONTACT hContact = (HCONTACT)wParam;
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (hNewContact == hContact && pThumb != NULL) {
@@ -204,7 +204,7 @@ static int OnContactDrop(WPARAM wParam, LPARAM lParam)
static int OnContactDragStop(WPARAM wParam, LPARAM lParam)
{
- HANDLE hContact = (HANDLE)wParam;
+ HCONTACT hContact = (HCONTACT)wParam;
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb != NULL && hNewContact == hContact) {
thumbList.RemoveThumb(pThumb);
@@ -228,7 +228,7 @@ static int OnSkinIconsChanged(WPARAM wParam, LPARAM lParam)
static int OnContactSettingChanged(WPARAM wParam, LPARAM lParam)
{
- HANDLE hContact = (HANDLE)wParam;
+ HCONTACT hContact = (HCONTACT)wParam;
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
int idStatus = ID_STATUS_OFFLINE;
BOOL bRefresh = TRUE;
@@ -292,7 +292,7 @@ static int OnStatusModeChange(WPARAM wParam, LPARAM lParam)
static int OnPrebuildContactMenu(WPARAM wParam, LPARAM lParam)
{
- ThumbInfo *pThumb = thumbList.FindThumbByContact((HANDLE) wParam );
+ ThumbInfo *pThumb = thumbList.FindThumbByContact((HCONTACT)wParam);
Menu_ShowItem(hMenuItemRemove, pThumb != NULL);
Menu_ShowItem(hMenuItemHideAll, !fcOpt.bHideAll);
@@ -516,7 +516,7 @@ static void UnregisterWindowClass()
UnregisterClass(WND_CLASS, hInst);
}
-static void CreateThumbWnd(TCHAR *ptszName, HANDLE hContact, int nX, int nY)
+static void CreateThumbWnd(TCHAR *ptszName, HCONTACT hContact, int nX, int nY)
{
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb != NULL)
@@ -609,7 +609,7 @@ static void CreateBackgroundBrush()
SetClassLong((HWND)WND_CLASS, GCLP_HBRBACKGROUND, (LONG)hBkBrush);
}
-static int GetContactStatus(HANDLE hContact)
+static int GetContactStatus(HCONTACT hContact)
{
if (hContact == NULL) {
assert( !"Contact is NULL" );
@@ -646,7 +646,7 @@ BOOL IsStatusVisible(int status)
return (0 == (dwOfflineModes & ClcStatusToPf2(status)));
}
-void RegHotkey(HANDLE hContact, HWND hwnd)
+void RegHotkey(HCONTACT hContact, HWND hwnd)
{
char szBuf[MAX_PATH] = {0};
@@ -696,7 +696,7 @@ void SaveContactsPos()
static void LoadContacts()
{
- for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
+ for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
LoadContact(hContact);
}
@@ -719,7 +719,7 @@ static INT_PTR OnMainMenu_HideAll(WPARAM wParam, LPARAM lParam)
static INT_PTR OnContactMenu_Remove(WPARAM wParam, LPARAM lParam)
{
- HANDLE hContact = (HANDLE)wParam;
+ HCONTACT hContact = (HCONTACT)wParam;
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb) {
pThumb->DeleteContactPos();
@@ -777,7 +777,7 @@ static void LoadMenus()
/////////////////////////////////////////////////////////////////////////////////////////
-static void LoadContact( HANDLE hContact )
+static void LoadContact( HCONTACT hContact )
{
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (hContact == NULL)
diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp
index ecbe70c6bb..4e0d991496 100644
--- a/plugins/FloatingContacts/src/thumbs.cpp
+++ b/plugins/FloatingContacts/src/thumbs.cpp
@@ -768,7 +768,7 @@ ThumbList::~ThumbList()
{
}
-ThumbInfo *ThumbList::AddThumb(HWND hwnd, TCHAR *ptszName, HANDLE hContact)
+ThumbInfo *ThumbList::AddThumb(HWND hwnd, TCHAR *ptszName, HCONTACT hContact)
{
if (ptszName == NULL || hContact == NULL || hwnd == NULL)
return NULL;
@@ -813,7 +813,7 @@ ThumbInfo* ThumbList::FindThumb(HWND hwnd)
return NULL;
}
-ThumbInfo *ThumbList::FindThumbByContact(HANDLE hContact)
+ThumbInfo *ThumbList::FindThumbByContact(HCONTACT hContact)
{
if (!hContact) return NULL;
diff --git a/plugins/FloatingContacts/src/thumbs.h b/plugins/FloatingContacts/src/thumbs.h
index 083f2bb4b3..f13251e22a 100644
--- a/plugins/FloatingContacts/src/thumbs.h
+++ b/plugins/FloatingContacts/src/thumbs.h
@@ -12,7 +12,7 @@ DockOpt;
struct ThumbInfo
{
- HANDLE hContact;
+ HCONTACT hContact;
HWND hwnd;
TCHAR ptszName[USERNAME_LEN];
int iIcon;
@@ -60,11 +60,11 @@ public:
ThumbList();
~ThumbList();
- ThumbInfo* AddThumb(HWND hwnd, TCHAR *ptszName, HANDLE hContact);
+ ThumbInfo* AddThumb(HWND hwnd, TCHAR *ptszName, HCONTACT hContact);
void RemoveThumb(ThumbInfo *pThumb);
ThumbInfo* FindThumb(HWND hwnd);
- ThumbInfo* FindThumbByContact(HANDLE hContact);
+ ThumbInfo* FindThumbByContact(HCONTACT hContact);
};
extern ThumbList thumbList;