summaryrefslogtreecommitdiff
path: root/plugins/MirandaG15
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-07-26 13:43:27 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-07-26 13:43:27 +0000
commit38f9ee31afcb519f7ecba02b56737ae637de5c7a (patch)
tree98a676cd76c8897c1a12ae69a4a3c740ac5cc065 /plugins/MirandaG15
parentf4af257e9365602dc81a4b324b0ffeed1e0b2eef (diff)
more warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@14728 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirandaG15')
-rw-r--r--plugins/MirandaG15/MirandaG15.vcxproj3
-rw-r--r--plugins/MirandaG15/src/CAppletManager.cpp15
-rw-r--r--plugins/MirandaG15/src/CChatScreen.cpp2
-rw-r--r--plugins/MirandaG15/src/CConfig.cpp2
-rw-r--r--plugins/MirandaG15/src/CContactList.cpp7
-rw-r--r--plugins/MirandaG15/src/CContactlistScreen.cpp4
-rw-r--r--plugins/MirandaG15/src/CCreditsScreen.cpp6
-rw-r--r--plugins/MirandaG15/src/CEventScreen.cpp2
-rw-r--r--plugins/MirandaG15/src/CNotificationScreen.cpp2
-rw-r--r--plugins/MirandaG15/src/CScreen.cpp2
-rw-r--r--plugins/MirandaG15/src/CScreensaverScreen.cpp6
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDConnection.cpp24
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.cpp9
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp4
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp1
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp2
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDList.h23
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp17
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp6
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDTextLog.cpp2
-rw-r--r--plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp2
-rw-r--r--plugins/MirandaG15/src/LCDFramework/LCDObject.cpp5
-rw-r--r--plugins/MirandaG15/src/Miranda.cpp6
23 files changed, 67 insertions, 85 deletions
diff --git a/plugins/MirandaG15/MirandaG15.vcxproj b/plugins/MirandaG15/MirandaG15.vcxproj
index 91a0db1fb6..55e0d885b6 100644
--- a/plugins/MirandaG15/MirandaG15.vcxproj
+++ b/plugins/MirandaG15/MirandaG15.vcxproj
@@ -26,6 +26,9 @@
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
<ItemDefinitionGroup>
+ <ClCompile>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ </ClCompile>
<Link>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index 37fa929a4e..8a8e771d45 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -311,7 +311,7 @@ void CAppletManager::OnScreenExpired(CLCDScreen *pScreen)
//************************************************************************
// the update timer's callback function
//************************************************************************
-VOID CALLBACK CAppletManager::UpdateTimer(HWND hwnd,UINT uMsg,UINT_PTR idEvent,DWORD dwTime)
+VOID CALLBACK CAppletManager::UpdateTimer(HWND, UINT, UINT_PTR, DWORD)
{
CAppletManager::GetInstance()->Update();
}
@@ -974,10 +974,9 @@ bool CAppletManager::TranslateDBEvent(CEvent *pEvent, WPARAM hContact, LPARAM hd
//************************************************************************
tstring CAppletManager::StripIRCFormatting(tstring strText)
{
- tstring::size_type end = 0, start = 0, i = 0;
+ tstring::size_type start = 0, i = 0;
tstring strEntity = _T("");
tstring strReplace = _T("");
- tstring::size_type len = strText.length();
while(i < strText.length())
{
@@ -1147,7 +1146,7 @@ CIRCHistory *CAppletManager::CreateIRCHistoryByName(tstring strProtocol,tstring
//************************************************************************
// inbound chat event hook function
//************************************************************************
-int CAppletManager::HookChatInbound(WPARAM wParam,LPARAM lParam)
+int CAppletManager::HookChatInbound(WPARAM, LPARAM lParam)
{
GCEVENT *gce = (GCEVENT*)lParam;
GCDEST *gcd;
@@ -1451,7 +1450,7 @@ int CAppletManager::HookChatInbound(WPARAM wParam,LPARAM lParam)
//************************************************************************
// message window event hook function
//************************************************************************
-int CAppletManager::HookMessageWindowEvent(WPARAM wParam, LPARAM lParam)
+int CAppletManager::HookMessageWindowEvent(WPARAM, LPARAM lParam)
{
MessageWindowEventData *mwed = (MessageWindowEventData*)lParam;
CEvent Event;
@@ -1601,7 +1600,7 @@ int CAppletManager::HookStatusChanged(WPARAM wParam, LPARAM lParam)
//************************************************************************
// protocoll ack hook function
//************************************************************************
-int CAppletManager::HookProtoAck(WPARAM wParam, LPARAM lParam)
+int CAppletManager::HookProtoAck(WPARAM, LPARAM lParam)
{
ACKDATA *pAck = (ACKDATA *) lParam;
@@ -1705,7 +1704,7 @@ int CAppletManager::HookProtoAck(WPARAM wParam, LPARAM lParam)
//************************************************************************
// contact added hook function
//************************************************************************
-int CAppletManager::HookContactAdded(WPARAM wParam, LPARAM lParam)
+int CAppletManager::HookContactAdded(WPARAM wParam, LPARAM)
{
CEvent Event;
Event.eType = EVENT_CONTACT_ADDED;
@@ -1718,7 +1717,7 @@ int CAppletManager::HookContactAdded(WPARAM wParam, LPARAM lParam)
//************************************************************************
// contact deleted hook function
//************************************************************************
-int CAppletManager::HookContactDeleted(WPARAM wParam, LPARAM lParam)
+int CAppletManager::HookContactDeleted(WPARAM wParam, LPARAM)
{
CEvent Event;
Event.eType = EVENT_CONTACT_DELETED;
diff --git a/plugins/MirandaG15/src/CChatScreen.cpp b/plugins/MirandaG15/src/CChatScreen.cpp
index 0f374d3aa4..c25ce353a2 100644
--- a/plugins/MirandaG15/src/CChatScreen.cpp
+++ b/plugins/MirandaG15/src/CChatScreen.cpp
@@ -775,7 +775,7 @@ void CChatScreen::OnLCDButtonRepeated(int iButton)
//************************************************************************
// Called when an LCD-button is released
//************************************************************************
-void CChatScreen::OnLCDButtonUp(int iButton)
+void CChatScreen::OnLCDButtonUp(int)
{
}
diff --git a/plugins/MirandaG15/src/CConfig.cpp b/plugins/MirandaG15/src/CConfig.cpp
index 4d92132a1b..48f9da6346 100644
--- a/plugins/MirandaG15/src/CConfig.cpp
+++ b/plugins/MirandaG15/src/CConfig.cpp
@@ -246,7 +246,7 @@ void CConfig::OnConnectionChanged() {
FillDeviceBox(CConfig::hDeviceBox);
}
-int CConfig::InitOptionsDialog(WPARAM wParam, LPARAM lParam)
+int CConfig::InitOptionsDialog(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 847000000;
diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp
index 8ce8cb2856..6964d74d59 100644
--- a/plugins/MirandaG15/src/CContactList.cpp
+++ b/plugins/MirandaG15/src/CContactList.cpp
@@ -392,7 +392,7 @@ void CContactList::DeleteItem(CContactListEntry *pEntry)
//************************************************************************
// Called to delete the specified group
//************************************************************************
-void CContactList::DeleteGroup(CContactListGroup *pGroup)
+void CContactList::DeleteGroup(CContactListGroup*)
{
}
@@ -404,7 +404,6 @@ void CContactList::DrawEntry(CLCDGfx *pGfx,CContactListEntry *pEntry,bool bSelec
if(pEntry == NULL)
return;
- int iOffset = 0;
tstring strText = _T("");
if(pEntry->iMessages > 0) {
strText = _T("[");
@@ -805,7 +804,6 @@ void CContactList::OnContactDeleted(MCONTACT hContact)
RemoveContact(hContact);
// Decrease the membercount of the old group, and check if it needs to be deleted
- int res = 0;
tstring strGroup = GetContactGroupPath(hContact);
if(!strGroup.empty())
{
@@ -1000,11 +998,8 @@ void CContactList::InitializeGroupObjects()
{
UninitializeGroupObjects();
- int res = 0;
CContactListGroup *pGroup = NULL;
-
- HANDLE hMetaContact = NULL;
char *szProto = NULL;
for(MCONTACT hContact = db_find_first();hContact != NULL;hContact = db_find_next(hContact))
{
diff --git a/plugins/MirandaG15/src/CContactlistScreen.cpp b/plugins/MirandaG15/src/CContactlistScreen.cpp
index b1b0b962b4..4a3efb282a 100644
--- a/plugins/MirandaG15/src/CContactlistScreen.cpp
+++ b/plugins/MirandaG15/src/CContactlistScreen.cpp
@@ -149,9 +149,7 @@ void CContactlistScreen::OnConfigChanged()
//************************************************************************
void CContactlistScreen::OnEventReceived(CEvent *pEvent)
{
- int iStatus = 0;
- switch(pEvent->eType)
- {
+ switch(pEvent->eType) {
case EVENT_SIGNED_ON:
case EVENT_SIGNED_OFF:
case EVENT_STATUS:
diff --git a/plugins/MirandaG15/src/CCreditsScreen.cpp b/plugins/MirandaG15/src/CCreditsScreen.cpp
index 5c3cd9669b..8219e5f353 100644
--- a/plugins/MirandaG15/src/CCreditsScreen.cpp
+++ b/plugins/MirandaG15/src/CCreditsScreen.cpp
@@ -225,21 +225,21 @@ void CCreditsScreen::OnSizeChanged()
//************************************************************************
// Called when an LCD-button is pressed
//************************************************************************
-void CCreditsScreen::OnLCDButtonDown(int iButton)
+void CCreditsScreen::OnLCDButtonDown(int)
{
}
//************************************************************************
// Called when an LCD-button event is repeated
//************************************************************************
-void CCreditsScreen::OnLCDButtonRepeated(int iButton)
+void CCreditsScreen::OnLCDButtonRepeated(int)
{
}
//************************************************************************
// Called when an LCD-button is released
//************************************************************************
-void CCreditsScreen::OnLCDButtonUp(int iButton)
+void CCreditsScreen::OnLCDButtonUp(int)
{
}
diff --git a/plugins/MirandaG15/src/CEventScreen.cpp b/plugins/MirandaG15/src/CEventScreen.cpp
index adf244362b..819ec8b3b9 100644
--- a/plugins/MirandaG15/src/CEventScreen.cpp
+++ b/plugins/MirandaG15/src/CEventScreen.cpp
@@ -211,7 +211,7 @@ void CEventScreen::OnLCDButtonRepeated(int iButton)
//************************************************************************
// Called when an LCD-button is released
//************************************************************************
-void CEventScreen::OnLCDButtonUp(int iButton)
+void CEventScreen::OnLCDButtonUp(int)
{
}
diff --git a/plugins/MirandaG15/src/CNotificationScreen.cpp b/plugins/MirandaG15/src/CNotificationScreen.cpp
index d950eccac8..0eb1cb3bdc 100644
--- a/plugins/MirandaG15/src/CNotificationScreen.cpp
+++ b/plugins/MirandaG15/src/CNotificationScreen.cpp
@@ -333,7 +333,7 @@ void CNotificationScreen::OnLCDButtonRepeated(int iButton)
//************************************************************************
// Called when an LCD-button is released
//************************************************************************
-void CNotificationScreen::OnLCDButtonUp(int iButton)
+void CNotificationScreen::OnLCDButtonUp(int)
{
}
diff --git a/plugins/MirandaG15/src/CScreen.cpp b/plugins/MirandaG15/src/CScreen.cpp
index 1759fa9686..a731ab4d19 100644
--- a/plugins/MirandaG15/src/CScreen.cpp
+++ b/plugins/MirandaG15/src/CScreen.cpp
@@ -158,7 +158,7 @@ void CScreen::UpdateButtons()
//************************************************************************
// Called when an event is received
//************************************************************************
-void CScreen::OnEventReceived(CEvent *pEvent)
+void CScreen::OnEventReceived(CEvent*)
{
}
diff --git a/plugins/MirandaG15/src/CScreensaverScreen.cpp b/plugins/MirandaG15/src/CScreensaverScreen.cpp
index 6c8a915a49..a9d418f3e9 100644
--- a/plugins/MirandaG15/src/CScreensaverScreen.cpp
+++ b/plugins/MirandaG15/src/CScreensaverScreen.cpp
@@ -158,21 +158,21 @@ void CScreensaverScreen::OnSizeChanged()
//************************************************************************
// Called when an LCD-button is pressed
//************************************************************************
-void CScreensaverScreen::OnLCDButtonDown(int iButton)
+void CScreensaverScreen::OnLCDButtonDown(int)
{
}
//************************************************************************
// Called when an LCD-button event is repeated
//************************************************************************
-void CScreensaverScreen::OnLCDButtonRepeated(int iButton)
+void CScreensaverScreen::OnLCDButtonRepeated(int)
{
}
//************************************************************************
// Called when an LCD-button is released
//************************************************************************
-void CScreensaverScreen::OnLCDButtonUp(int iButton)
+void CScreensaverScreen::OnLCDButtonUp(int)
{
}
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<SLCDPixel*>::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<T,G> *GetNextEntry(CListEntry<T,G> *pEntry)
+ virtual CListEntry<T,G> *GetNextEntry(CListEntry<T,G>*)
{
return NULL;
}
- virtual CListEntry<T,G> *GetPreviousEntry(CListEntry<T,G> *pEntry)
+ virtual CListEntry<T,G> *GetPreviousEntry(CListEntry<T,G>*)
{
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<T,G>* >::iterator iter = m_Entrys.begin();
- CListItem<T,G> *pItem = NULL;
- CListContainer<T,G> *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
diff --git a/plugins/MirandaG15/src/Miranda.cpp b/plugins/MirandaG15/src/Miranda.cpp
index 1515978515..8b3c76e946 100644
--- a/plugins/MirandaG15/src/Miranda.cpp
+++ b/plugins/MirandaG15/src/Miranda.cpp
@@ -89,7 +89,7 @@ void UnInit();
// Exported Functions
//************************************************************************
-EXTERN_C __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+EXTERN_C __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfoEx;
}
@@ -132,7 +132,7 @@ EXTERN_C int __declspec(dllexport) Unload(void)
//
// EntryPoint of the DLL
//************************************************************************
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
{
hInstance = hinstDLL;
return TRUE;
@@ -145,7 +145,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
// This is where the main plugin initialization happens and the
// connection to the LCD is established,
//************************************************************************
-int Init(WPARAM wParam,LPARAM lParam)
+int Init(WPARAM, LPARAM)
{
g_AppletManager = new CAppletManager();
// Memoryleak Detection