From 38f9ee31afcb519f7ecba02b56737ae637de5c7a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Jul 2015 13:43:27 +0000 Subject: more warning fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@14728 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../MirandaG15/src/LCDFramework/CLCDConnection.cpp | 24 +++++++++++++--------- .../src/LCDFramework/CLCDConnectionLogitech.cpp | 9 +++----- plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp | 4 ---- plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp | 1 - plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp | 2 -- plugins/MirandaG15/src/LCDFramework/CLCDList.h | 23 ++++++++------------- .../src/LCDFramework/CLCDOutputManager.cpp | 17 +++++++-------- plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp | 6 +++--- .../MirandaG15/src/LCDFramework/CLCDTextLog.cpp | 2 -- .../MirandaG15/src/LCDFramework/CLCDTextObject.cpp | 2 +- plugins/MirandaG15/src/LCDFramework/LCDObject.cpp | 5 ++--- 11 files changed, 41 insertions(+), 54 deletions(-) (limited to 'plugins/MirandaG15/src/LCDFramework') diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDConnection.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDConnection.cpp index cee754739c..6b449f5db2 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDConnection.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDConnection.cpp @@ -19,7 +19,7 @@ CLCDConnection::~CLCDConnection() //************************************************************************ // Initializes the connection to the LCD //************************************************************************ -bool CLCDConnection::Initialize(tstring strAppletName,bool bAutostart, bool bConfigDialog) +bool CLCDConnection::Initialize(tstring, bool, bool) { return false; } @@ -51,7 +51,7 @@ int CLCDConnection::GetConnectionState() //************************************************************************ // Returns the state of the specified Button //************************************************************************ -bool CLCDConnection::GetButtonState(int iButton) +bool CLCDConnection::GetButtonState(int) { return false; } @@ -59,7 +59,7 @@ bool CLCDConnection::GetButtonState(int iButton) //************************************************************************ // returns the id of the specified button //************************************************************************ -int CLCDConnection::GetButtonId(int iButton) { +int CLCDConnection::GetButtonId(int) { return 0; } @@ -82,14 +82,14 @@ bool CLCDConnection::Draw() //************************************************************************ // Temporarily brings the applet to foreground //************************************************************************ -void CLCDConnection::SetAlert(bool bAlert) +void CLCDConnection::SetAlert(bool) { } //************************************************************************ // Activates the applet on the LCD //************************************************************************ -void CLCDConnection::SetAsForeground(bool bSetAsForeground) +void CLCDConnection::SetAsForeground(bool) { } @@ -139,7 +139,7 @@ PBYTE CLCDConnection::GetPixelBuffer() //************************************************************************ // Get the pointer to the pixel buffer //************************************************************************ -CLCDDevice* CLCDConnection::GetAttachedDevice(int iIndex) +CLCDDevice* CLCDConnection::GetAttachedDevice(int) { return NULL; } @@ -147,27 +147,31 @@ CLCDDevice* CLCDConnection::GetAttachedDevice(int iIndex) //************************************************************************ // Connects to the specified LCD //************************************************************************ -bool CLCDConnection::Connect(int iIndex) { +bool CLCDConnection::Connect(int ) +{ return false; } //************************************************************************ // Connects to the specified LCD //************************************************************************ -bool CLCDConnection::Disconnect() { +bool CLCDConnection::Disconnect() +{ return false; } //************************************************************************ // Toggles the automatic reconnection //************************************************************************ -void CLCDConnection::SetReconnect(bool bSet) { +void CLCDConnection::SetReconnect(bool bSet) +{ m_bReconnect = bSet; } //************************************************************************ // returns a pointer to the current device //************************************************************************ -CLCDDevice* CLCDConnection::GetConnectedDevice() { +CLCDDevice* CLCDConnection::GetConnectedDevice() +{ return NULL; } \ No newline at end of file diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.cpp index 00a91a2706..bd882b136f 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.cpp @@ -2,14 +2,14 @@ #include "CLCDConnectionLogitech.h" #include "CLCDOutputManager.h" -DWORD WINAPI softButtonCallback(IN int device, +DWORD WINAPI softButtonCallback(IN int, IN DWORD dwButtons, IN const PVOID pContext) { ((CLCDConnectionLogitech*)pContext)->OnSoftButtonCB(dwButtons); return 0; } -DWORD WINAPI notificationCallback(IN int connection, +DWORD WINAPI notificationCallback(IN int, IN const PVOID pContext, IN DWORD notificationCode, IN DWORD notifyParm1, @@ -359,7 +359,7 @@ void CLCDConnectionLogitech::OnSoftButtonCB(DWORD state) { m_dwButtonState = state; } -void CLCDConnectionLogitech::OnNotificationCB(DWORD notificationCode, DWORD notifyParm1, DWORD notifyParm2, DWORD notifyParm3, DWORD notifyParm4) { +void CLCDConnectionLogitech::OnNotificationCB(DWORD notificationCode, DWORD notifyParm1, DWORD, DWORD, DWORD) { CLgLCDDevice *device; switch (notificationCode) { @@ -559,12 +559,9 @@ void CLCDConnectionLogitech::SetAlert(bool bAlert) void CLCDConnectionLogitech::SetAsForeground(bool bSetAsForeground) { // TODO: Activate when 1.02 is out - DWORD dwSet = bSetAsForeground ? LGLCD_LCD_FOREGROUND_APP_YES : LGLCD_LCD_FOREGROUND_APP_NO; m_bSetAsForeground = bSetAsForeground; if (LGLCD_INVALID_DEVICE != m_hDevice) - { lgLcdSetAsLCDForegroundApp(m_hDevice, bSetAsForeground); - } } //************************************************************************ diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp index c8e4ed75d5..b258952b16 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp @@ -314,7 +314,6 @@ void CLCDGfx::DrawText(int nX, int nY, LPCTSTR sText) //************************************************************************ void CLCDGfx::DrawText(int nX,int nY,int nWidth,tstring strText) { - SIZE sizeChar = {0, 0}; SIZE sizeLine = {0, 0}; SIZE sizeCutOff = {0, 0}; @@ -489,11 +488,8 @@ void CLCDGfx::EndDraw(void) memset(m_pLcdBitmapBits,0x00,m_nHeight * m_nWidth); SLCDPixel *pPixel = NULL; vector::iterator iter = m_LMovingPixels.begin(); - int iPosition = 0; int iIndex = 0,iMoved = 0; - double dTest = sin(3.14/2); - while(iter != m_LMovingPixels.end()) { pPixel = *iter; diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp index 773645edac..0239c6b75f 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp @@ -613,7 +613,6 @@ void CLCDInput::UpdateOffsets(int iModified) int iMaxChars = 0; SIZE sizeWord = {0, 0}; - SIZE sizeChar = {0, 0}; SIZE sizeLine = {0, 0}; SelectObject(hDC, m_hFont); diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp index 7415ea5567..06f4076e83 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp @@ -137,9 +137,7 @@ void CLCDLabel::UpdateCutOffIndex() return; int iWidth = GetWidth(); - SIZE sizeChar = {0, 0}; SIZE sizeLine = {0, 0}; - SIZE sizeWord = {0,0}; SIZE sizeCutOff = {0, 0}; int iAvailableLines = GetHeight()/m_iFontHeight; diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDList.h b/plugins/MirandaG15/src/LCDFramework/CLCDList.h index 8afe19e995..0f7006d46d 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDList.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDList.h @@ -53,12 +53,12 @@ public: return m_pParent->GetPreviousEntry(this); } - virtual CListEntry *GetNextEntry(CListEntry *pEntry) + virtual CListEntry *GetNextEntry(CListEntry*) { return NULL; } - virtual CListEntry *GetPreviousEntry(CListEntry *pEntry) + virtual CListEntry *GetPreviousEntry(CListEntry*) { return NULL; } @@ -83,11 +83,11 @@ public: m_pRoot = pRoot; } - virtual void DeleteItem(T Entry) + virtual void DeleteItem(T) { } - virtual void DeleteGroup(G Group) + virtual void DeleteGroup(G) { } @@ -170,7 +170,6 @@ public: bool empty() { - bool b = m_Entrys.empty(); return m_Entrys.empty(); } @@ -196,8 +195,6 @@ public: void Clear() { list< CListEntry* >::iterator iter = m_Entrys.begin(); - CListItem *pItem = NULL; - CListContainer *pContainer = NULL; while(iter != m_Entrys.end()) { @@ -605,8 +602,7 @@ public: SelectObject(pGfx->GetHDC(),m_hFont); POINT ptPrevViewportOrg = { 0, 0 }; - HRGN hRgn = NULL; - int iHeight = 0,iLimit=0; + int iHeight = 0; int iYOffset = 0, iXOffset=0; int iColWidth = (GetWidth()- (m_iColumns-1)*3)/m_iColumns; int iSpace = GetHeight() - (GetHeight()/m_iEntryHeight)*m_iEntryHeight; @@ -783,7 +779,6 @@ public: { m_Position = pEntry; - int iPerPage = (GetHeight()/m_iEntryHeight)*m_iColumns; if(m_Position->GetIndex() < m_iStartIndex) m_iStartIndex--; return true; @@ -904,7 +899,7 @@ protected: //************************************************************************ // Called to delete the specified entry //************************************************************************ - virtual void DeleteEntry(T Entry) + virtual void DeleteEntry(T) { } @@ -912,7 +907,7 @@ protected: //************************************************************************ // Called to delete the specified group //************************************************************************ - virtual void DeleteGroup(G Group) + virtual void DeleteGroup(G) { } @@ -920,14 +915,14 @@ protected: //************************************************************************ // Called to draw the specified entry //************************************************************************ - virtual void DrawEntry(CLCDGfx *pGfx,T Entry, bool bSelected) + virtual void DrawEntry(CLCDGfx*, T, bool) { } //************************************************************************ // Called to draw the specified entry //************************************************************************ - virtual void DrawGroup(CLCDGfx *pGfx,G Group, bool bOpen, bool bSelected) + virtual void DrawGroup(CLCDGfx*, G, bool, bool) { } diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp index e21a125906..d7107c888c 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp @@ -197,8 +197,6 @@ bool CLCDOutputManager::Update() { ASSERT(m_bInitialized); - DWORD dwElapsed = GetTickCount() - m_dwLastUpdate; - // Update the active screen if(m_pActiveScreen != NULL) { @@ -379,14 +377,14 @@ void CLCDOutputManager::SetButtonRepeatDelay(DWORD dwDelay) //************************************************************************ // Called when a screen has been deactivated //************************************************************************ -void CLCDOutputManager::OnScreenDeactivated(CLCDScreen *pScreen) +void CLCDOutputManager::OnScreenDeactivated(CLCDScreen*) { } //************************************************************************ // Called when a screen has expired //************************************************************************ -void CLCDOutputManager::OnScreenExpired(CLCDScreen *pScreen) +void CLCDOutputManager::OnScreenExpired(CLCDScreen*) { } @@ -421,7 +419,7 @@ void CLCDOutputManager::OnLCDButtonUp(int iButton) //************************************************************************ // Called when the connection state has changed //************************************************************************ -void CLCDOutputManager::OnConnectionChanged(int iConnectionState) +void CLCDOutputManager::OnConnectionChanged(int) { } @@ -442,12 +440,15 @@ void CLCDOutputManager::OnLCDDisconnected() //************************************************************************ // Called by the LCDManager to open a config dialog //************************************************************************ -DWORD WINAPI CLCDOutputManager::configDialogCallback(IN int connection,IN const PVOID pContext) { - return CLCDOutputManager::GetInstance()->OnConfigDialogRequest(connection,pContext); +DWORD WINAPI CLCDOutputManager::configDialogCallback(IN int connection,IN const PVOID pContext) +{ + return CLCDOutputManager::GetInstance()->OnConfigDialogRequest(connection, pContext); } + //************************************************************************ // Called when a config dialog is requested //************************************************************************ -DWORD CLCDOutputManager::OnConfigDialogRequest(int connection, const PVOID pContext) { +DWORD CLCDOutputManager::OnConfigDialogRequest(int, const PVOID) +{ return 0; } \ No newline at end of file diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp index fa1a59e49a..d599220b69 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp @@ -260,7 +260,7 @@ void CLCDScreen::OnExpiration() //************************************************************************ // Called when an LCD-button is pressed //************************************************************************ -void CLCDScreen::OnLCDButtonDown(int iButton) +void CLCDScreen::OnLCDButtonDown(int) { } @@ -268,7 +268,7 @@ void CLCDScreen::OnLCDButtonDown(int iButton) //************************************************************************ // Called when an LCD-button event is repeated //************************************************************************ -void CLCDScreen::OnLCDButtonRepeated(int iButton) +void CLCDScreen::OnLCDButtonRepeated(int) { } @@ -276,7 +276,7 @@ void CLCDScreen::OnLCDButtonRepeated(int iButton) //************************************************************************ // Called when an LCD-button is released //************************************************************************ -void CLCDScreen::OnLCDButtonUp(int iButton) +void CLCDScreen::OnLCDButtonUp(int) { } \ No newline at end of file diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.cpp index 9814f93024..1db6536e08 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.cpp @@ -301,8 +301,6 @@ void CLCDTextLog::WrapMessage(CLogEntry *pEntry) int i = 0; tstring strLine = _T(""); tstring strWord = _T(""); - SIZE sizeWord = {0, 0}; - SIZE sizeChar = {0, 0}; SIZE sizeLine = {0, 0}; int *piExtents = new int[strString.length()]; diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp index 9d49c40aa8..bad6b61c75 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp @@ -53,7 +53,7 @@ bool CLCDTextObject::Shutdown() //************************************************************************ // draws the textobject //************************************************************************ -bool CLCDTextObject::Draw(CLCDGfx *pGfx) +bool CLCDTextObject::Draw(CLCDGfx*) { return true; } diff --git a/plugins/MirandaG15/src/LCDFramework/LCDObject.cpp b/plugins/MirandaG15/src/LCDFramework/LCDObject.cpp index 2fe0319ca3..72971bc738 100644 --- a/plugins/MirandaG15/src/LCDFramework/LCDObject.cpp +++ b/plugins/MirandaG15/src/LCDFramework/LCDObject.cpp @@ -123,7 +123,7 @@ bool CLCDObject::Update() //************************************************************************ // Draw the object //************************************************************************ -bool CLCDObject::Draw(CLCDGfx *pGfx) +bool CLCDObject::Draw(CLCDGfx*) { return true; } @@ -131,7 +131,6 @@ bool CLCDObject::Draw(CLCDGfx *pGfx) //************************************************************************ // Called when the size of the object changed //************************************************************************ -void CLCDObject::OnSizeChanged(SIZE OldSize) +void CLCDObject::OnSizeChanged(SIZE) { - } \ No newline at end of file -- cgit v1.2.3