double ;; removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@6125 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

11 files changed, 18 insertions, 21 deletions

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index f4ffd09007..42010b65a1 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -2303,7 +2303,7 @@ void TSAPI AdjustTabClientRect(TContainerData *pContainer, RECT *rc)
 				}

 			}

 			else {

-				rc->top += (dwTopPad - 2);;

+				rc->top += (dwTopPad - 2);

 				rc->bottom = rcTabOrig.bottom;

 			}

 		}

@@ -2311,7 +2311,7 @@ void TSAPI AdjustTabClientRect(TContainerData *pContainer, RECT *rc)
 			if (pContainer->dwFlags & CNT_TABSBOTTOM)

 				rc->bottom = rcTab.bottom + 2;

 			else {

-				rc->top += (dwTopPad - 2);;

+				rc->top += (dwTopPad - 2);

 				rc->bottom = rcTabOrig.bottom;

 			}

 		}

diff --git a/plugins/TabSRMM/src/controls.h b/plugins/TabSRMM/src/controls.h
index b2ead85824..0c566ffdfb 100644
--- a/plugins/TabSRMM/src/controls.h
+++ b/plugins/TabSRMM/src/controls.h
@@ -98,7 +98,7 @@ private:
    HWND     m_hwndToolbar;

    RECT     m_rcClient;

    TContainerData *m_pContainer;

-   HMENU    m_activeMenu, m_activeSubMenu;;

+   HMENU    m_activeMenu, m_activeSubMenu;

    int      m_activeID;

    bool     m_fTracking;

    bool     m_isContactMenu;

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index e8e6105282..727408080d 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -880,7 +880,7 @@ void TSAPI DM_SetDBButtonStates(HWND hwndChild, TWindowData *dat)
 	ButtonItem *buttonItem = dat->pContainer->buttonItems;

 	HANDLE hContact = dat->hContact, hFinalContact = 0;

 	char *szModule, *szSetting;

-	HWND hwndContainer = dat->pContainer->hwnd;;

+	HWND hwndContainer = dat->pContainer->hwnd;

 

 	while (buttonItem) {

 		BOOL result = FALSE;

diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp
index f1277ba502..8074a91c2a 100644
--- a/plugins/TabSRMM/src/infopanel.cpp
+++ b/plugins/TabSRMM/src/infopanel.cpp
@@ -570,7 +570,7 @@ void CInfoPanel::RenderIPStatus(const HDC hdc, RECT& rcItem)
 		GetTextExtentPoint32(hdc, szResult, lstrlen(szResult), &sTime);

 	}

 

-	m_dat->panelStatusCX = 3 + sStatus.cx + sProto.cx + 14 + (m_dat->hClientIcon ? 20 : 0) + sTime.cx + 13;;

+	m_dat->panelStatusCX = 3 + sStatus.cx + sProto.cx + 14 + (m_dat->hClientIcon ? 20 : 0) + sTime.cx + 13;

 

 	if (m_dat->panelStatusCX != oldPanelStatusCX) {

 		SendMessage(m_dat->hwnd, WM_SIZE, 0, 0);

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index ec719312e4..40e8722576 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1805,7 +1805,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 			rc.left = CInfoPanel::LEFT_OFFSET_LOGO;

 			rc.right = cx - dat->panelWidth - (panelHeight < CInfoPanel::DEGRADE_THRESHOLD ? (dat->rcStatus.right - dat->rcStatus.left) + 3 : 0);

-			rc.bottom = panelHeight - (panelHeight >= CInfoPanel::DEGRADE_THRESHOLD ? dat->ipFieldHeight : 0) - 1;;

+			rc.bottom = panelHeight - (panelHeight >= CInfoPanel::DEGRADE_THRESHOLD ? dat->ipFieldHeight : 0) - 1;

 			rc.top = 1;

 			dat->rcNick = rc;

 

diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index 983b2080d8..6a1d0aa1c3 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -931,7 +931,7 @@ static char *Template_CreateRTFFromDbEvent(TWindowData *dat, HANDLE hContact, HA
 								c = (char)0xcd;

 								break;

 							case EVENTTYPE_ERRMSG:

-								c = (char)0x72;;

+								c = (char)0x72;

 								break;

 							default:

 								c = (char)0xaa;

@@ -1244,7 +1244,7 @@ void TSAPI StreamInEvents(HWND hwndDlg, HANDLE hDbEventFirst, int count, int fAp
 	si.cbSize = sizeof(si);

 	/*

 	if (IsWindow(hwndrtf)) {

-		si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;;

+		si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;

 		GetScrollInfo(hwndrtf, SB_VERT, &si);

 		SendMessage(hwndrtf, EM_GETSCROLLPOS, 0, (LPARAM)&pt);

 

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 0cca4b3074..f7e933b826 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -566,7 +566,7 @@ int LoadSendRecvMessageModule(void)
 

 	INITCOMMONCONTROLSEX icex;

 	icex.dwSize = sizeof(INITCOMMONCONTROLSEX);

-	icex.dwICC  = ICC_COOL_CLASSES | ICC_BAR_CLASSES | ICC_LISTVIEW_CLASSES;;

+	icex.dwICC  = ICC_COOL_CLASSES | ICC_BAR_CLASSES | ICC_LISTVIEW_CLASSES;

 	InitCommonControlsEx(&icex);

 

 	Utils::loadSystemLibrary(L"\\riched20.dll");

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 22e859bd0e..085e1d99cd 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -58,7 +58,7 @@ bool CSendLaterJob::isPersistentJob()
 bool CSendLaterJob::mustDelete()

 {

 	if (fSuccess)

-		return true;;

+		return true;

 	

 	if (fFailed && bCode == JOB_REMOVABLE)

 		return true;

diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp
index b47cf211c1..0218261176 100644
--- a/plugins/TabSRMM/src/tabctrl.cpp
+++ b/plugins/TabSRMM/src/tabctrl.cpp
@@ -1437,7 +1437,7 @@ INT_PTR CALLBACK DlgProcTabConfig(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 	case WM_USER + 100:

 		SendDlgItemMessage(hwndDlg, IDC_TABBORDERSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));

 		SendDlgItemMessage(hwndDlg, IDC_TABBORDERSPIN, UDM_SETPOS, 0, (int)M.GetByte(CSkin::m_skinEnabled ? "S_tborder" : "tborder", 2));

-		SetDlgItemInt(hwndDlg, IDC_TABBORDER, (int)M.GetByte(CSkin::m_skinEnabled ? "S_tborder" : "tborder", 2), FALSE);;

+		SetDlgItemInt(hwndDlg, IDC_TABBORDER, (int)M.GetByte(CSkin::m_skinEnabled ? "S_tborder" : "tborder", 2), FALSE);

 

 		SendDlgItemMessage(hwndDlg, IDC_BOTTOMTABADJUSTSPIN, UDM_SETRANGE, 0, MAKELONG(3, -3));

 		SendDlgItemMessage(hwndDlg, IDC_BOTTOMTABADJUSTSPIN, UDM_SETPOS, 0, PluginConfig.tabConfig.m_bottomAdjust);

@@ -1461,8 +1461,8 @@ INT_PTR CALLBACK DlgProcTabConfig(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		SendDlgItemMessage(hwndDlg, IDC_SPIN3, UDM_SETRANGE, 0, MAKELONG(10, 1));

 		SendDlgItemMessage(hwndDlg, IDC_SPIN1, UDM_SETPOS, 0, (LPARAM)M.GetByte("y-pad", 3));

 		SendDlgItemMessage(hwndDlg, IDC_SPIN3, UDM_SETPOS, 0, (LPARAM)M.GetByte("x-pad", 4));

-		SetDlgItemInt(hwndDlg, IDC_TABPADDING, (int)M.GetByte("y-pad", 3), FALSE);;

-		SetDlgItemInt(hwndDlg, IDC_HTABPADDING, (int)M.GetByte("x-pad", 4), FALSE);;

+		SetDlgItemInt(hwndDlg, IDC_TABPADDING, (int)M.GetByte("y-pad", 3), FALSE);

+		SetDlgItemInt(hwndDlg, IDC_HTABPADDING, (int)M.GetByte("x-pad", 4), FALSE);

 		return 0;

 

 	case WM_NOTIFY:

@@ -1545,7 +1545,7 @@ int TSAPI RegisterTabCtrlClass(void)
 	RegisterClassEx(&wc);

 

 	wc.lpszClassName  = _T("TS_SideBarClass");

-	wc.lpfnWndProc    = CSideBar::wndProcStub;;

+	wc.lpfnWndProc    = CSideBar::wndProcStub;

 	wc.hCursor        = LoadCursor(NULL, IDC_ARROW);

 	wc.cbWndExtra     = sizeof(void*);

 	wc.style          = CS_GLOBALCLASS;// | CS_DBLCLKS; // | CS_PARENTDC;

diff --git a/plugins/TabSRMM/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp
index 6ecef2f8b5..62f94b91fd 100644
--- a/plugins/TabSRMM/src/taskbar.cpp
+++ b/plugins/TabSRMM/src/taskbar.cpp
@@ -1,7 +1,4 @@
 /*

- * astyle --force-indent=tab=4 --brackets=linux --indent-switches

- *		  --pad=oper --one-line=keep-blocks  --unpad=paren

- *

  * Miranda NG: the free IM client for Microsoft* Windows*

  *

  * Copyright 2000-2009 Miranda ICQ/IM project,

@@ -76,7 +73,7 @@ bool CTaskbarInteract::setOverlayIcon(HWND hwndDlg, LPARAM lParam) const
 {

 	if (m_pTaskbarInterface && m_isEnabled && m_fHaveLargeicons) {

 		m_pTaskbarInterface->SetOverlayIcon(hwndDlg,(HICON)lParam, NULL);

-		return true;;

+		return true;

 	}

 	return false;

 }

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index 2b2558e243..6df580e003 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -1499,7 +1499,7 @@ void CSkin::Load(void)
 	m_sidebarTopOffset = GetPrivateProfileInt(_T("ClientArea"), _T("SidebarTop"), -1, m_tszFileName);

 	m_sidebarBottomOffset = GetPrivateProfileInt(_T("ClientArea"), _T("SidebarBottom"), -1, m_tszFileName);

 

-	m_bClipBorder = GetPrivateProfileInt(_T("WindowFrame"), _T("ClipFrame"), 0, m_tszFileName) ? true : false;;

+	m_bClipBorder = GetPrivateProfileInt(_T("WindowFrame"), _T("ClipFrame"), 0, m_tszFileName) ? true : false;

 

 	BYTE radius_tl, radius_tr, radius_bl, radius_br;

 	TCHAR 	szFinalName[MAX_PATH];

@@ -2230,7 +2230,7 @@ bool __fastcall CSkin::DrawItem(const HDC hdc, const RECT *rc, const CSkinItem *
 	if (!item->IGNORED) {

 		::DrawAlpha(hdc, const_cast<RECT *>(rc), item->COLOR, item->ALPHA, item->COLOR2, item->COLOR2_TRANSPARENT,

 				  item->GRADIENT, item->CORNER, item->BORDERSTYLE, item->imageItem);

-		return true;;

+		return true;

 	}

 	return false;

 }

@@ -2306,7 +2306,7 @@ void CSkin::RenderToolbarBG(const TWindowData *dat, HDC hdc, const RECT &rcWindo
 		bool	 fTbColorsValid = PluginConfig.m_tbBackgroundHigh && PluginConfig.m_tbBackgroundLow;

 		BYTE	 bAlphaOffset = 0;

 		BOOL 	fMustDrawNonThemed = ((bAero || fTbColorsValid) && !M.GetByte(SRMSGMOD_T, "forceThemedToolbar", 0));

-		RECT 	rc, rcToolbar;;

+		RECT 	rc, rcToolbar;

 		POINT	pt;

 

 		if (!(dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR)) {