summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/FloatingContacts/src/bitmap_funcs.cpp10
-rw-r--r--plugins/FloatingContacts/src/bitmap_funcs.h6
-rw-r--r--plugins/FloatingContacts/src/filedrop.cpp6
-rw-r--r--plugins/FloatingContacts/src/main.cpp32
-rw-r--r--plugins/FloatingContacts/src/options.cpp2
-rw-r--r--plugins/FloatingContacts/src/thumbs.cpp10
-rw-r--r--plugins/FloatingContacts/src/thumbs.h6
7 files changed, 35 insertions, 37 deletions
diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp
index 25347c47fb..eaccf7c358 100644
--- a/plugins/FloatingContacts/src/bitmap_funcs.cpp
+++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp
@@ -532,7 +532,7 @@ void MyBitmap::DrawPart(MyBitmap *bmp, int xin, int yin, int win, int hin, int x
}
}
-void MyBitmap::DrawNoAlpha(MyBitmap *bmp, int x, int y, int w, int h)
+void MyBitmap::DrawNoAlpha(MyBitmap *bmp, int x, int y)
{
if (!(bits && bmp && bmp->bits)) return;
@@ -888,7 +888,7 @@ static int hex2dec(char hex)
return 0;
}
-bool MyBitmap::loadFromFile_pixel(const char *fn, const char *fnAlpha)
+bool MyBitmap::loadFromFile_pixel(const char *fn)
{
allocate(1, 1);
int r, g, b, a = 255;
@@ -900,7 +900,7 @@ bool MyBitmap::loadFromFile_pixel(const char *fn, const char *fnAlpha)
return true;
}
-bool MyBitmap::loadFromFile_gradient(const char *fn, const char *fnAlpha)
+bool MyBitmap::loadFromFile_gradient(const char *fn)
{
const char *p = fn + mir_strlen("gradient:");
@@ -968,10 +968,10 @@ bool MyBitmap::loadFromFile(const char *fn, const char *fnAlpha)
if (bits) free();
if (!strncmp(fn, "pixel:", mir_strlen("pixel:")))
- return loadFromFile_pixel(fn, fnAlpha);
+ return loadFromFile_pixel(fn);
if (!strncmp(fn, "gradient:", mir_strlen("gradient:")))
- return loadFromFile_gradient(fn, fnAlpha);
+ return loadFromFile_gradient(fn);
return loadFromFile_default(fn, fnAlpha);
}
diff --git a/plugins/FloatingContacts/src/bitmap_funcs.h b/plugins/FloatingContacts/src/bitmap_funcs.h
index 85bbee2004..d28923ff8d 100644
--- a/plugins/FloatingContacts/src/bitmap_funcs.h
+++ b/plugins/FloatingContacts/src/bitmap_funcs.h
@@ -41,8 +41,8 @@ private:
void free();
- bool loadFromFile_pixel(const char *fn, const char *fnAlpha = 0);
- bool loadFromFile_gradient(const char *fn, const char *fnAlpha = 0);
+ bool loadFromFile_pixel(const char *fn);
+ bool loadFromFile_gradient(const char *fn);
bool loadFromFile_png(const char *fn, const char *fnAlpha = 0);
bool loadFromFile_default(const char *fn, const char *fnAlpha = 0);
void premultipleChannels();
@@ -76,7 +76,7 @@ public:
void DrawBits(COLOR32 *inbits, int inw, int inh, int x, int y, int w, int h);
void BlendBits(COLOR32 *inbits, int inw, int inh, int x, int y, int w, int h);
- void DrawNoAlpha(MyBitmap *bmp, int x, int y, int w, int h);
+ void DrawNoAlpha(MyBitmap *bmp, int x, int y);
void Blend(MyBitmap *bmp, int x, int y, int w, int h);
void Draw(MyBitmap *bmp, int x, int y, int w, int h);
diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp
index 311c2acee2..5858e85789 100644
--- a/plugins/FloatingContacts/src/filedrop.cpp
+++ b/plugins/FloatingContacts/src/filedrop.cpp
@@ -29,8 +29,7 @@ ULONG STDMETHODCALLTYPE CDropTarget::Release()
return res;
}
-
-HRESULT STDMETHODCALLTYPE CDropTarget::DragOver(DWORD fKeyState, POINTL pt, DWORD *pdwEffect)
+HRESULT STDMETHODCALLTYPE CDropTarget::DragOver(DWORD, POINTL, DWORD *pdwEffect)
{
*pdwEffect = 0;
@@ -43,7 +42,6 @@ HRESULT STDMETHODCALLTYPE CDropTarget::DragOver(DWORD fKeyState, POINTL pt, DWOR
return S_OK;
}
-
HRESULT STDMETHODCALLTYPE CDropTarget::DragEnter(IDataObject *pData, DWORD fKeyState, POINTL pt, DWORD *pdwEffect)
{
FORMATETC feFile = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
@@ -82,7 +80,7 @@ HRESULT STDMETHODCALLTYPE CDropTarget::DragLeave()
}
-HRESULT STDMETHODCALLTYPE CDropTarget::Drop(IDataObject *pData, DWORD fKeyState, POINTL pt, DWORD *pdwEffect)
+HRESULT STDMETHODCALLTYPE CDropTarget::Drop(IDataObject *pData, DWORD, POINTL, DWORD *pdwEffect)
{
FORMATETC fe = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index 464521581a..8f6ad70b15 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -105,7 +105,7 @@ PLUGININFOEX pluginInfoEx =
{ 0x53c715a8, 0xeb01, 0x4136, { 0xa7, 0x3c, 0x44, 0x18, 0x68, 0x61, 0x0, 0x74 } }
};
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfoEx;
}
@@ -113,7 +113,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
///////////////////////////////////////////////////////
// Load / unload
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
{
hInst = hinstDLL;
return TRUE;
@@ -134,7 +134,7 @@ static LPCTSTR s_fonts[FLT_FONTIDS] =
///////////////////////////////////////////////////////
// Hooked events
-static int OnContactDeleted(WPARAM hContact, LPARAM lParam)
+static int OnContactDeleted(WPARAM hContact, LPARAM)
{
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb) {
@@ -156,7 +156,7 @@ static int OnContactIconChanged(WPARAM hContact, LPARAM lParam)
return 0;
}
-static int OnContactDrag(WPARAM hContact, LPARAM lParam)
+static int OnContactDrag(WPARAM hContact, LPARAM)
{
POINT pt;
GetCursorPos(&pt);
@@ -180,7 +180,7 @@ static int OnContactDrag(WPARAM hContact, LPARAM lParam)
return hNewContact != NULL;
}
-static int OnContactDrop(WPARAM hContact, LPARAM lParam)
+static int OnContactDrop(WPARAM hContact, LPARAM)
{
RECT rcMiranda;
RECT rcThumb;
@@ -198,7 +198,7 @@ static int OnContactDrop(WPARAM hContact, LPARAM lParam)
return 1;
}
-static int OnContactDragStop(WPARAM hContact, LPARAM lParam)
+static int OnContactDragStop(WPARAM hContact, LPARAM)
{
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb != NULL && hNewContact == hContact) {
@@ -209,7 +209,7 @@ static int OnContactDragStop(WPARAM hContact, LPARAM lParam)
return 0;
}
-static int OnSkinIconsChanged(WPARAM wParam, LPARAM lParam)
+static int OnSkinIconsChanged(WPARAM, LPARAM)
{
// Get handle to the image list
himlMiranda = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0);
@@ -261,7 +261,7 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam)
return 0;
}
-static int OnStatusModeChange(WPARAM wParam, LPARAM lParam)
+static int OnStatusModeChange(WPARAM wParam, LPARAM)
{
for (int i = 0; i < thumbList.getCount(); ++i) {
int idStatus = GetContactStatus(thumbList[i].hContact);
@@ -275,7 +275,7 @@ static int OnStatusModeChange(WPARAM wParam, LPARAM lParam)
return 0;
}
-static int OnPrebuildContactMenu(WPARAM wParam, LPARAM lParam)
+static int OnPrebuildContactMenu(WPARAM wParam, LPARAM)
{
ThumbInfo *pThumb = thumbList.FindThumbByContact(wParam);
@@ -390,11 +390,11 @@ static LRESULT __stdcall CommWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
break;
case WM_LBUTTONDOWN:
- if (pThumb) pThumb->OnLButtonDown(LOWORD(lParam), HIWORD(lParam));
+ if (pThumb) pThumb->OnLButtonDown();
break;
case WM_MOUSEMOVE:
- if (pThumb) pThumb->OnMouseMove(LOWORD(lParam), HIWORD(lParam), wParam);
+ if (pThumb) pThumb->OnMouseMove(LOWORD(lParam), HIWORD(lParam));
break;
case WM_LBUTTONUP:
@@ -678,7 +678,7 @@ static void LoadContacts()
/////////////////////////////////////////////////////////////////////////////////////////
// Menus
-static INT_PTR OnMainMenu_HideAll(WPARAM wParam, LPARAM lParam)
+static INT_PTR OnMainMenu_HideAll(WPARAM, LPARAM)
{
fcOpt.bHideAll = !fcOpt.bHideAll;
db_set_b(NULL, MODULE, "HideAll", (BYTE)fcOpt.bHideAll);
@@ -691,7 +691,7 @@ static INT_PTR OnMainMenu_HideAll(WPARAM wParam, LPARAM lParam)
return 0;
}
-static INT_PTR OnContactMenu_Remove(WPARAM hContact, LPARAM lParam)
+static INT_PTR OnContactMenu_Remove(WPARAM hContact, LPARAM)
{
ThumbInfo *pThumb = thumbList.FindThumbByContact(hContact);
if (pThumb) {
@@ -703,7 +703,7 @@ static INT_PTR OnContactMenu_Remove(WPARAM hContact, LPARAM lParam)
return 0;
}
-static INT_PTR OnHotKey_HideWhenCListShow(WPARAM wParam, LPARAM lParam)
+static INT_PTR OnHotKey_HideWhenCListShow(WPARAM, LPARAM)
{
fcOpt.bHideWhenCListShow = !fcOpt.bHideWhenCListShow;
db_set_b(NULL, MODULE, "HideWhenCListShow", (BYTE)fcOpt.bHideWhenCListShow);
@@ -796,7 +796,7 @@ BOOL HideOnFullScreen()
return bFullscreen && fcOpt.bHideWhenFullscreen;
}
-static VOID CALLBACK ToTopTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
+static VOID CALLBACK ToTopTimerProc(HWND, UINT, UINT_PTR, DWORD)
{
for (int i = 0; i < thumbList.getCount(); ++i)
SetWindowPos(thumbList[i].hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
@@ -858,7 +858,7 @@ static LRESULT __stdcall newMirandaWndProc(HWND hwnd, UINT uMsg, WPARAM wParam,
/////////////////////////////////////////////////////////////////////////////////////////
-static int OnModulesLoded(WPARAM wParam, LPARAM lParam)
+static int OnModulesLoded(WPARAM, LPARAM)
{
HookEvent(ME_CLIST_CONTACTICONCHANGED, OnContactIconChanged);
HookEvent(ME_SKIN_ICONSCHANGED, OnSkinIconsChanged);
diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp
index 7cd5b9680d..7ab90df3b8 100644
--- a/plugins/FloatingContacts/src/options.cpp
+++ b/plugins/FloatingContacts/src/options.cpp
@@ -330,7 +330,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
/////////////////////////////////////////////////////////////////////////////////////////
-int OnOptionsInitialize(WPARAM wParam, LPARAM lParam)
+int OnOptionsInitialize(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp
index e5e3e09482..a060262332 100644
--- a/plugins/FloatingContacts/src/thumbs.cpp
+++ b/plugins/FloatingContacts/src/thumbs.cpp
@@ -190,10 +190,10 @@ void ThumbInfo::PositionThumbWorker(int nX, int nY, POINT *newPos)
if (fcOpt.bMoveTogether) {
if (bDockedRight)
- DockThumbs(this, pCurThumb, TRUE);
+ DockThumbs(this, pCurThumb);
if (bDockedLeft)
- DockThumbs(pCurThumb, this, FALSE);
+ DockThumbs(pCurThumb, this);
}
// Lower-left
@@ -324,7 +324,7 @@ void ThumbInfo::DeleteContactPos()
db_unset(hContact, MODULE, "ThumbsPos");
}
-void ThumbInfo::OnLButtonDown(int nX, int nY)
+void ThumbInfo::OnLButtonDown()
{
if (bEnableTip && fcOpt.bShowTip)
KillTip();
@@ -369,7 +369,7 @@ void ThumbInfo::OnLButtonUp()
SaveContactsPos();
}
-void ThumbInfo::OnMouseMove(int nX, int nY, WPARAM wParam)
+void ThumbInfo::OnMouseMove(int nX, int nY)
{
// Position thumb
if (bMouseDown) {
@@ -702,7 +702,7 @@ void ThumbInfo::OnTimer(BYTE idTimer)
}
}
-void DockThumbs(ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight, BOOL bMoveLeft)
+void DockThumbs(ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight)
{
if (pThumbRight->dockOpt.hwndLeft == NULL && pThumbLeft->dockOpt.hwndRight == NULL) {
pThumbRight->dockOpt.hwndLeft = pThumbLeft->hwnd;
diff --git a/plugins/FloatingContacts/src/thumbs.h b/plugins/FloatingContacts/src/thumbs.h
index c1bedb61ef..0fe58fceb0 100644
--- a/plugins/FloatingContacts/src/thumbs.h
+++ b/plugins/FloatingContacts/src/thumbs.h
@@ -39,9 +39,9 @@ public:
void RefreshContactIcon(int iIcon);
void RefreshContactStatus(int idStatus);
void DeleteContactPos();
- void OnLButtonDown(int nX, int nY);
+ void OnLButtonDown();
void OnLButtonUp();
- void OnMouseMove(int nX, int nY, WPARAM wParam);
+ void OnMouseMove(int nX, int nY);
void ThumbSelect(BOOL bMouse);
void ThumbDeselect(BOOL bMouse);
void SetThumbOpacity(BYTE btAlpha);
@@ -52,7 +52,7 @@ public:
};
void UndockThumbs(ThumbInfo *pThumb1, ThumbInfo *pThumb2);
-void DockThumbs(ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight, BOOL bMoveLeft);
+void DockThumbs(ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight);
class ThumbList: public OBJLIST<ThumbInfo>
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 06:08:46 +0000