DWORD -> uint32_t

4 files changed, 20 insertions, 20 deletions

diff --git a/plugins/FloatingContacts/src/filedrop.h b/plugins/FloatingContacts/src/filedrop.h
index 9ca6441865..78308782e9 100644
--- a/plugins/FloatingContacts/src/filedrop.h
+++ b/plugins/FloatingContacts/src/filedrop.h
@@ -10,16 +10,18 @@ private:
 	unsigned long refCount;

 

 public:

-	CDropTarget(): refCount(0) {}

+	CDropTarget() : 

+		refCount(0)

+	{}

 

-	HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid,LPVOID *ppvObj);

+	HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID *ppvObj);

 	ULONG STDMETHODCALLTYPE AddRef();

 	ULONG STDMETHODCALLTYPE Release();

 	HRESULT STDMETHODCALLTYPE DragOver(DWORD fKeyState, POINTL pt, DWORD *pdwEffect);

 	HRESULT STDMETHODCALLTYPE DragEnter(IDataObject *pData, DWORD fKeyState, POINTL pt, DWORD *pdwEffect);

 	HRESULT STDMETHODCALLTYPE DragLeave();

-	HRESULT STDMETHODCALLTYPE Drop(IDataObject *pData,DWORD fKeyState,POINTL pt,DWORD *pdwEffect);

+	HRESULT STDMETHODCALLTYPE Drop(IDataObject *pData, DWORD fKeyState, POINTL pt, DWORD *pdwEffect);

 };

 

-void RegisterFileDropping( HWND hwnd, CDropTarget* pdropTarget );

-void UnregisterFileDropping( HWND hwnd );

+void RegisterFileDropping(HWND hwnd, CDropTarget *pdropTarget);

+void UnregisterFileDropping(HWND hwnd);

diff --git a/plugins/FloatingContacts/src/fltcont.h b/plugins/FloatingContacts/src/fltcont.h
index 0530c7d78f..5e0d234ab1 100644
--- a/plugins/FloatingContacts/src/fltcont.h
+++ b/plugins/FloatingContacts/src/fltcont.h
@@ -91,7 +91,7 @@ extern COLORREF		tColor[FLT_FONTIDS];
 extern HPEN			hLTEdgesPen;

 extern HPEN			hRBEdgesPen;

 extern HBRUSH		hBkBrush;

-extern DWORD		bkColor;

+extern uint32_t		bkColor;

 extern HBITMAP		hBmpBackground;

 extern uint16_t			nBackgroundBmpUse;

 

diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index cf6a506dce..eb64c54463 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -37,8 +37,6 @@ static void GetScreenRect(void);
 extern void SetThumbsOpacity(uint8_t btAlpha);

 static int  ClcStatusToPf2(int status);

 

-static VOID CALLBACK ToTopTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

-

 HFONT      hFont[FLT_FONTIDS];

 COLORREF   tColor[FLT_FONTIDS];

 HIMAGELIST himlMiranda;

@@ -47,16 +45,16 @@ MCONTACT   hNewContact;
 HPEN       hLTEdgesPen;

 HPEN       hRBEdgesPen;

 HBRUSH     hBkBrush;

-DWORD      bkColor;

+uint32_t   bkColor;

 HBITMAP    hBmpBackground;

-uint16_t       nBackgroundBmpUse = CLB_STRETCH;

+uint16_t   nBackgroundBmpUse = CLB_STRETCH;

 

 HWND       hwndMiranda;

 BOOL       bVersionOK;

 BOOL       bDockHorz = TRUE;

 HMENU      hContactMenu;

 RECT       rcScreen;

-DWORD      dwOfflineModes;

+uint32_t   dwOfflineModes;

 BOOL       bEnableTip;

 UINT_PTR   ToTopTimerID;

 BOOL       bIsCListShow;

@@ -284,7 +282,7 @@ static void LoadDBSettings()
 	fcOpt.bHideWhenFullscreen = (BOOL)g_plugin.getByte("HideWhenFullscreen", 0);

 	fcOpt.bMoveTogether = (BOOL)g_plugin.getByte("MoveTogether", 0);

 	fcOpt.bFixedWidth = (BOOL)g_plugin.getByte("FixedWidth", 0);

-	fcOpt.nThumbWidth = (DWORD)g_plugin.getDword("Width", 0);

+	fcOpt.nThumbWidth = (uint32_t)g_plugin.getDword("Width", 0);

 	dwOfflineModes = Clist::OfflineModes;

 	fcOpt.bShowTip = (BOOL)g_plugin.getByte("ShowTip", 1);

 	fcOpt.TimeIn = g_plugin.getWord("TimeIn", 0);

@@ -447,6 +445,12 @@ void OnStatusChanged()
 	}

 }

 

+static VOID CALLBACK ToTopTimerProc(HWND, UINT, UINT_PTR, DWORD)

+{

+	for (auto &it : thumbList)

+		SetWindowPos(it->hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);

+}

+

 void ApplyOptionsChanges()

 {

 	CreateThumbsFont();

@@ -746,7 +750,7 @@ static void LoadContact(MCONTACT hContact)
 	if (hContact == NULL)

 		return;

 

-	DWORD	dwPos = g_plugin.getDword(hContact, "ThumbsPos", (DWORD)-1);

+	uint32_t	dwPos = g_plugin.getDword(hContact, "ThumbsPos", (uint32_t)-1);

 	if (dwPos != -1) {

 		wchar_t	*ptName = Clist_GetContactDisplayName(hContact);

 		if (ptName != nullptr) {

@@ -786,12 +790,6 @@ BOOL HideOnFullScreen()
 	return bFullscreen && fcOpt.bHideWhenFullscreen;

 }

 

-static VOID CALLBACK ToTopTimerProc(HWND, UINT, UINT_PTR, DWORD)

-{

-	for (auto &it : thumbList)

-		SetWindowPos(it->hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);

-}

-

 void ShowThumbsOnHideCList()

 {

 	if (!fcOpt.bHideWhenCListShow || fcOpt.bHideAll || HideOnFullScreen())

diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp
index 4f529ce056..9336087235 100644
--- a/plugins/FloatingContacts/src/thumbs.cpp
+++ b/plugins/FloatingContacts/src/thumbs.cpp
@@ -475,7 +475,7 @@ void ThumbInfo::UpdateContent()
 	HFONT hOldFont;

 	SIZE  size;

 	RECT  rc, rcText;

-	DWORD oldColor;

+	uint32_t oldColor;

 	int   oldBkMode, index = 0;// nStatus;

 	UINT	fStyle = ILD_NORMAL;