diff options
56 files changed, 77 insertions, 84 deletions
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Background.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Background.cpp index 06b31aa332..db481e7728 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Background.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/Background.cpp @@ -215,7 +215,7 @@ static BOOL FillBackgroundBitmap(FIBITMAP *dib, const RGBQUAD *color, int options) { if ((!dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) { - return FALSE;; + return FALSE; } if (!color) { diff --git a/plugins/AdvaImg/src/Metadata/IPTC.cpp b/plugins/AdvaImg/src/Metadata/IPTC.cpp index bde718c986..6f28c486b3 100644 --- a/plugins/AdvaImg/src/Metadata/IPTC.cpp +++ b/plugins/AdvaImg/src/Metadata/IPTC.cpp @@ -91,7 +91,7 @@ read_iptc_profile(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen) { offset++; int directoryType = profile[offset++]; - int tagType = profile[offset++];; + int tagType = profile[offset++]; int tagByteCount = ((profile[offset] & 0xFF) << 8) | (profile[offset + 1] & 0xFF); offset += 2; diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 5f09e17638..fd26b45ab7 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -348,7 +348,7 @@ static INT_PTR CALLBACK PopupOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP CallService(MS_POPUP_ADDPOPUPT, (WPARAM) &ppd, APF_NO_HISTORY);
_tcsncpy(ppd.lptzText, TranslateT("You awaited this contact!"), MAX_SECONDLINE);
- ppd.lchIcon = Skin_GetIcon("enabled_icon");;
+ ppd.lchIcon = Skin_GetIcon("enabled_icon");
CallService(MS_POPUP_ADDPOPUPT, (WPARAM) &ppd, APF_NO_HISTORY);
}
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index 685aa0c7c0..a37aedb829 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -882,7 +882,7 @@ static void _AniAva_LoadOptions() ((0) ? AAO_OPAQUE :0);
if (s_bFlags & AAO_HAS_BORDER)
- s_borderColor = (COLORREF)db_get_dw(NULL,"CList","AvatarsBorderColor",SETTINGS_AVATARBORDERCOLOR_DEFAULT);;
+ s_borderColor = (COLORREF)db_get_dw(NULL,"CList","AvatarsBorderColor",SETTINGS_AVATARBORDERCOLOR_DEFAULT);
if (s_bFlags & AAO_ROUND_CORNERS)
s_cornerRadius = db_get_b(NULL,"CList","AvatarsUseCustomCornerSize",SETTINGS_AVATARUSECUTOMCORNERSIZE_DEFAULT)? db_get_w(NULL,"CList","AvatarsCustomCornerSize",SETTINGS_AVATARCORNERSIZE_DEFAULT) : 0;
if (s_bFlags & AAO_HAS_OVERLAY) {
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 25f1253c44..a0bde6cc4e 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -501,7 +501,7 @@ static LRESULT clcOnSize(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARA RECT rc = {0};
GetClientRect(hwnd, &rc);
if (rc.right == 0)
- return corecli.pfnContactListControlWndProc(hwnd,msg,wParam,lParam);;
+ return corecli.pfnContactListControlWndProc(hwnd,msg,wParam,lParam);
rc.bottom = max (dat->row_min_heigh, 1);
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index 03fbb58d02..7e776c9ecf 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -357,7 +357,7 @@ int cliShowHide(WPARAM wParam,LPARAM lParam) BOOL bShow = FALSE;
int iVisibleState = GetWindowVisibleState(pcli->hwndContactList, 0, 0);
- int method = db_get_b(NULL, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT);; //(0-none, 1-leftedge, 2-rightedge);
+ int method = db_get_b(NULL, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT); //(0-none, 1-leftedge, 2-rightedge);
if (method) {
if ( db_get_b(NULL, "ModernData", "BehindEdge", SETTING_BEHINDEDGE_DEFAULT) == 0 && lParam != 1)
CLUI_HideBehindEdge(); //hide
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 8a6e0eedb5..59eb6ed3ab 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -1838,7 +1838,7 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam) }
case WM_SIZING:
- return DefWindowProc(m_hWnd, msg, wParam, lParam);;
+ return DefWindowProc(m_hWnd, msg, wParam, lParam);
case WM_MOVE:
{
@@ -2127,7 +2127,7 @@ LRESULT CLUI::OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam) return 0;
}
}
- return DefWindowProc(m_hWnd, msg, wParam, lParam);;
+ return DefWindowProc(m_hWnd, msg, wParam, lParam);
}
LRESULT CLUI::OnSetFocus(UINT msg, WPARAM wParam, LPARAM lParam)
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 77c4de6ead..d97d4ea88f 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -254,7 +254,7 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA POINT Offset;
TTBCtrlButton* mtbi = (TTBCtrlButton*)pMTBInfo->pButtonList->items[i];
GetWindowRect(mtbi->hWindow, &childRect);
- Offset.x = childRect.left - MyRect.left;;
+ Offset.x = childRect.left - MyRect.left;
Offset.y = childRect.top - MyRect.top;
SendMessage(mtbi->hWindow, BUTTONDRAWINPARENT, (WPARAM)hDC, (LPARAM)&Offset);
}
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index ad4717d393..91d1f7a24f 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -1086,7 +1086,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM POINT Offset;
GetWindowRect(hwnd,&MyRect);
GetWindowRect(GetDlgItem(hwnd, _buttons[i]),&childRect);
- Offset.x = childRect.left-MyRect.left;;
+ Offset.x = childRect.left-MyRect.left;
Offset.y = childRect.top-MyRect.top;
SendMessage(GetDlgItem(hwnd, _buttons[i]),BUTTONDRAWINPARENT,(WPARAM)hdc2,(LPARAM)&Offset);
}
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index 1a572f808e..0d9699bd97 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -30,7 +30,7 @@ HFONT __fastcall ChangeToFont(HDC hdc, struct ClcData *dat, int id, int *fontHei extern HWND g_hwndViewModeFrame, g_hwndEventArea;
extern int mf_updatethread_running;
-extern HANDLE hThreadMFUpdate;;
+extern HANDLE hThreadMFUpdate;
void MF_UpdateThread(LPVOID);
@@ -2127,7 +2127,7 @@ int CLUIFramesResize(const RECT newsize) int clientfrm, clientframe = -1;
int i, j;
int sepw;
- int topOff = 0, botOff = 0, last_bottomtop;;
+ int topOff = 0, botOff = 0, last_bottomtop;
GapBetweenFrames = cfg::dat.gapBetweenFrames;
sepw = GapBetweenFrames;
@@ -2894,7 +2894,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA oldframeheight = Frames[Framemod].height;
SetCapture(hwnd);
ulockfrm();
- break;;
+ break;
}
newh = oldframeheight + direction * (ypos - lbypos);
if (newh > 0) {
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 2783641b9e..1e97314b93 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -318,7 +318,7 @@ BYTE GetCachedStatusMsg(TExtraCache *p, char *szProto) if (p->hTimeZone == NULL)
TZ_LoadTimeZone(hContact, p, szProto);
- return p->bStatusMsgValid;;
+ return p->bStatusMsgValid;
}
/*
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 730b7db3a0..5c2913e44f 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -1046,9 +1046,9 @@ bgskipped: qLeft = rc.left;
}
else {
- qLeft = rcContent.left + (indent == 0 && iconXSpace == 0 ? 2 : 0);;
+ qLeft = rcContent.left + (indent == 0 && iconXSpace == 0 ? 2 : 0);
rc.left = qLeft;
- rc.right = min(rc.left + textSize.cx, clRect->right - dat->rightMargin);;
+ rc.right = min(rc.left + textSize.cx, clRect->right - dat->rightMargin);
DrawText(hdcMem, contact->szText, -1, &rc, DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE | DT_WORD_ELLIPSIS);
rightLineStart = qLeft + textSize.cx + 2;
}
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index a758656de2..41df2be7b2 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -683,7 +683,7 @@ int CustomDrawScrollBars(NMCSBCUSTOMDRAW *nmcsbcd) break;
case HTSCROLL_PAGEGDOWN:
case HTSCROLL_PAGEGUP:
- uItemID = nmcsbcd->uItem == HTSCROLL_PAGEGUP ? ID_EXTBKSCROLLBACK : ID_EXTBKSCROLLBACKLOWER;;
+ uItemID = nmcsbcd->uItem == HTSCROLL_PAGEGUP ? ID_EXTBKSCROLLBACK : ID_EXTBKSCROLLBACKLOWER;
rgn = CreateRectRgn(nmcsbcd->rect.left, nmcsbcd->rect.top, nmcsbcd->rect.right, nmcsbcd->rect.bottom);
SelectClipRgn(hdcScroll, rgn);
break;
diff --git a/plugins/ExternalAPI/m_dbx_tree.h b/plugins/ExternalAPI/m_dbx_tree.h index 932b1bcdb6..073f56043b 100644 --- a/plugins/ExternalAPI/m_dbx_tree.h +++ b/plugins/ExternalAPI/m_dbx_tree.h @@ -24,11 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define M_DBX_TREE_H__ 1
-#ifndef _MSC_VER
#include <stdint.h>
-#else
-#include "stdint.h"
-#endif
#pragma pack(push, 8)
diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp index d176ebc159..36fb31a185 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp @@ -891,7 +891,7 @@ void MyBitmap::DrawText(TCHAR *str, int x, int y, int blur, int strength) COLOR32 rlx,glx,blx;
COLOR32 axx = geta(cl);
COLOR32 mmx = (bx+gx+rx)/3;
- COLOR32 nx = mmx;;//pbGammaWeight[mx];//
+ COLOR32 nx = mmx; //pbGammaWeight[mx];//
{
//Normalize components to alpha level
bx = (nx*(255-axx)+bx*axx)/255;
diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp index 6ba7cbd57e..7519023438 100644 --- a/plugins/IEView/src/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp @@ -83,7 +83,7 @@ char *HistoryHTMLBuilder::timestampToString(DWORD dwFlags, time_t check) { static char szResult[512];
char str[80];
DBTIMETOSTRING dbtts;
- dbtts.cbDest = 70;;
+ dbtts.cbDest = 70;
dbtts.szDest = str;
szResult[0] = '\0';
dbtts.szFormat = (char *)"d t";
diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp index 51e8f7f628..ecfd10b7f2 100644 --- a/plugins/IEView/src/MUCCHTMLBuilder.cpp +++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp @@ -83,7 +83,7 @@ char *MUCCHTMLBuilder::timestampToString(DWORD dwData, time_t check) DBTIMETOSTRING dbtts;
- dbtts.cbDest = 70;;
+ dbtts.cbDest = 70;
dbtts.szDest = str;
szResult[0] = '\0';
diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index af97c04504..6aa5f904e9 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -129,7 +129,7 @@ char *ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod szResult[0] = '\0';
format[0] = '\0';
- dbtts.cbDest = 70;;
+ dbtts.cbDest = 70;
dbtts.szDest = str;
dbtts.szFormat = format;
diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index 7326240b77..41bd1680b9 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -164,7 +164,7 @@ char *TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isG time_t now = time(NULL);
time_t today;
- dbtts.cbDest = 70;;
+ dbtts.cbDest = 70;
dbtts.szDest = str;
if (!isGroupBreak || !(dwFlags & MWF_LOG_SHOWDATES)) {
diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index d50f0fc95a..53a3c5f7f4 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -404,7 +404,7 @@ BOOL checkNotesIniFile(BOOL bInfo) strncpy_s(tmp1,_countof(tmp1),tmp,sizeof(tmp1));//copy temporary
assert(strlen(tmp1)>0);
- char* PLUGINNAME_lower = _strlwr(mir_strdup(PLUGINNAME));;
+ char* PLUGINNAME_lower = _strlwr(mir_strdup(PLUGINNAME));
//is there our plugin as safe?
if(strstr(tmp1,PLUGINNAME_lower) == NULL)
diff --git a/plugins/MirandaNGHistoryToDB/Global.pas b/plugins/MirandaNGHistoryToDB/Global.pas index fc4cc4c4bb..16c1638195 100644 --- a/plugins/MirandaNGHistoryToDB/Global.pas +++ b/plugins/MirandaNGHistoryToDB/Global.pas @@ -662,8 +662,8 @@ begin HToDB := FindWindow(nil, pWideChar(WinName));
if HToDB <> 0 then
begin
- copyDataStruct.dwData := {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(cdtString);;
- copyDataStruct.cbData := Length(EncryptMsg) * SizeOf(Char);;
+ copyDataStruct.dwData := {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(cdtString);
+ copyDataStruct.cbData := Length(EncryptMsg) * SizeOf(Char);
copyDataStruct.lpData := PChar(EncryptMsg);
SendMessage(HToDB, WM_COPYDATA, 0, {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(@copyDataStruct));
if EnableDebug then WriteInLog(ProfilePath, FormatDateTime('dd.mm.yy hh:mm:ss', Now) + ' - Функция OnSendMessageToAllComponent: Отправка запроса "' + Msg + '" окну ' + WinName, 2);
@@ -673,8 +673,8 @@ begin HToDB := FindWindow(nil, pWideChar(WinName));
if HToDB <> 0 then
begin
- copyDataStruct.dwData := {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(cdtString);;
- copyDataStruct.cbData := Length(EncryptMsg) * SizeOf(Char);;
+ copyDataStruct.dwData := {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(cdtString);
+ copyDataStruct.cbData := Length(EncryptMsg) * SizeOf(Char);
copyDataStruct.lpData := PChar(EncryptMsg);
SendMessage(HToDB, WM_COPYDATA, 0, {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(@copyDataStruct));
if EnableDebug then WriteInLog(ProfilePath, FormatDateTime('dd.mm.yy hh:mm:ss', Now) + ' - Функция OnSendMessageToAllComponent: Отправка запроса "' + Msg + '" окну ' + WinName, 2);
@@ -684,8 +684,8 @@ begin HToDB := FindWindow(nil, pWideChar(WinName));
if HToDB <> 0 then
begin
- copyDataStruct.dwData := {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(cdtString);;
- copyDataStruct.cbData := Length(EncryptMsg) * SizeOf(Char);;
+ copyDataStruct.dwData := {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(cdtString);
+ copyDataStruct.cbData := Length(EncryptMsg) * SizeOf(Char);
copyDataStruct.lpData := PChar(EncryptMsg);
SendMessage(HToDB, WM_COPYDATA, 0, {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(@copyDataStruct));
if EnableDebug then WriteInLog(ProfilePath, FormatDateTime('dd.mm.yy hh:mm:ss', Now) + ' - Функция OnSendMessageToAllComponent: Отправка запроса "' + Msg + '" окну ' + WinName, 2);
@@ -695,8 +695,8 @@ begin HToDB := FindWindow(nil, pWideChar(WinName));
if HToDB <> 0 then
begin
- copyDataStruct.dwData := {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(cdtString);;
- copyDataStruct.cbData := Length(EncryptMsg) * SizeOf(Char);;
+ copyDataStruct.dwData := {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(cdtString);
+ copyDataStruct.cbData := Length(EncryptMsg) * SizeOf(Char);
copyDataStruct.lpData := PChar(EncryptMsg);
SendMessage(HToDB, WM_COPYDATA, 0, {$IFDEF WIN32}Integer{$ELSE}LongInt{$ENDIF}(@copyDataStruct));
if EnableDebug then WriteInLog(ProfilePath, FormatDateTime('dd.mm.yy hh:mm:ss', Now) + ' - Функция OnSendMessageToAllComponent: Отправка запроса "' + Msg + '" окну ' + WinName, 2);
diff --git a/plugins/MirandaNGHistoryToDB/HistoryToDBUpdater/Global.pas b/plugins/MirandaNGHistoryToDB/HistoryToDBUpdater/Global.pas index 6747ee346d..f3f68e7ea2 100644 --- a/plugins/MirandaNGHistoryToDB/HistoryToDBUpdater/Global.pas +++ b/plugins/MirandaNGHistoryToDB/HistoryToDBUpdater/Global.pas @@ -239,7 +239,7 @@ begin if Str <> '' then
begin
Cipher.Reset;
- Result := Cipher.DecryptString(Str);;
+ Result := Cipher.DecryptString(Str);
end;
end;
diff --git a/plugins/MirandaNGHistoryToDB/MirandaNGHistoryToDB.dpr b/plugins/MirandaNGHistoryToDB/MirandaNGHistoryToDB.dpr index 3f59234df9..82768f86cd 100644 --- a/plugins/MirandaNGHistoryToDB/MirandaNGHistoryToDB.dpr +++ b/plugins/MirandaNGHistoryToDB/MirandaNGHistoryToDB.dpr @@ -631,7 +631,7 @@ begin Si.Position := 500060000;
Si.szName.a := pAnsiChar(AnsiString(Format(WideStringToString(GetLangStr('IMButtonCaption'), CP_ACP), [htdPluginShortName])));
Si.pszService := MS_MHTD_SHOWHISTORY;//MS_HISTORY_SHOWCONTACTHISTORY;
- Si.hIcon := LoadImage(hInstance,'ICON_0',IMAGE_ICON,16,16,0);;
+ Si.hIcon := LoadImage(hInstance,'ICON_0',IMAGE_ICON,16,16,0);
HookSystemHistoryMenu := CallService(MS_CLIST_ADDMAINMENUITEM,0,LPARAM(@Si));
//{$endif REPLDEFHISTMOD}
// Создаем свой пункт в меню контакта
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index 9b76303565..1b1fbda9e5 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -961,7 +961,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar sBrowseInfo.pidlRoot = NULL;
sBrowseInfo.pszDisplayName = lpDestDir;
sBrowseInfo.lpszTitle = TranslateT("Select Destination Directory");
- sBrowseInfo.ulFlags = BIF_NEWDIALOGSTYLE | BIF_EDITBOX;;
+ sBrowseInfo.ulFlags = BIF_NEWDIALOGSTYLE | BIF_EDITBOX;
sBrowseInfo.lpfn = NULL;
sBrowseInfo.lParam = 0;
sBrowseInfo.iImage = 0;
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index c1803c92ef..d2b8740033 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -368,7 +368,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP if(OpenClipboard(hwndDlg)) { char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", ""); - std::string str = szKey;; + std::string str = szKey; mir_free(szKey); boost::algorithm::replace_all(str, "\n", "\r\n"); HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, str.size() +1); diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index 2d22d3bd81..b5c018d517 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -543,7 +543,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar SetTimer(hwnd, TIMER_ID, 1000, TimerProc);
PostMessage(hwnd, WM_SIZE, 0, 0);
- return TRUE;;
+ return TRUE;
case WM_ACTIVATE:
if(wParam==WA_INACTIVE) {
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index ef469ca756..262171f5d6 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -400,7 +400,7 @@ static INT_PTR CALLBACK DlgProcTabsOptions(HWND hwndDlg, UINT msg, WPARAM wParam EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABSNUM), bChecked );
bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS) && IsDlgButtonChecked(hwndDlg, IDC_SEPARATECHATSCONTAINERS);
EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABS), bChecked );
- bChecked = bChecked && IsDlgButtonChecked(hwndDlg, IDC_LIMITCHATSTABS);;
+ bChecked = bChecked && IsDlgButtonChecked(hwndDlg, IDC_LIMITCHATSTABS);
EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABSNUM), bChecked );
return TRUE;
}
diff --git a/plugins/Scriver/src/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp index 5b9ea9d56e..a7d4cf726e 100644 --- a/plugins/Scriver/src/msgwindow.cpp +++ b/plugins/Scriver/src/msgwindow.cpp @@ -1225,11 +1225,11 @@ static void DrawTab(ParentWindowData *dat, HWND hwnd, WPARAM wParam, LPARAM lPar hlRect.right-=GetSystemMetrics(SM_CXEDGE);
} else {
if (atTop) {
- hlRect.top += GetSystemMetrics(SM_CYEDGE);;
- hlRect.bottom += GetSystemMetrics(SM_CYEDGE);;
+ hlRect.top += GetSystemMetrics(SM_CYEDGE);
+ hlRect.bottom += GetSystemMetrics(SM_CYEDGE);
} else {
- hlRect.top -= GetSystemMetrics(SM_CYEDGE);;
- hlRect.bottom -= GetSystemMetrics(SM_CYEDGE);;
+ hlRect.top -= GetSystemMetrics(SM_CYEDGE);
+ hlRect.bottom -= GetSystemMetrics(SM_CYEDGE);
}
}
FrameRect(lpDIS->hDC, &hlRect, GetSysColorBrush(COLOR_HIGHLIGHT));
diff --git a/plugins/SmileyAdd/src/SmileyBase.cpp b/plugins/SmileyAdd/src/SmileyBase.cpp index badb6d43e8..206ee79a73 100644 --- a/plugins/SmileyAdd/src/SmileyBase.cpp +++ b/plugins/SmileyAdd/src/SmileyBase.cpp @@ -136,7 +136,7 @@ void ISmileyBase::SetPosition(HWND hwnd, LPCRECT lpRect) else if (lpRect->bottom == -1)
{
m_orect.top = lpRect->top;
- m_orect.bottom = lpRect->top + m_sizeExtent.cy;;
+ m_orect.bottom = lpRect->top + m_sizeExtent.cy;
}
else
{
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)) {
diff --git a/plugins/TrafficCounter/src/statistics.cpp b/plugins/TrafficCounter/src/statistics.cpp index 42bf0aaa10..a55659b96e 100644 --- a/plugins/TrafficCounter/src/statistics.cpp +++ b/plugins/TrafficCounter/src/statistics.cpp @@ -292,7 +292,7 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA r += r > 0x80 ? -40 : 40;
g += g > 0x80 ? -40 : 40;
b += b > 0x80 ? -40 : 40;
- lplvcd->clrTextBk = RGB(r, g, b);;
+ lplvcd->clrTextBk = RGB(r, g, b);
}
SetWindowLong(hwndDlg, DWLP_MSGRESULT, CDRF_NEWFONT);
return TRUE;
diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp index 46c717f6ec..c9bcf042c9 100644 --- a/plugins/UserInfoEx/src/classPsTreeItem.cpp +++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp @@ -340,7 +340,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn // no valid icon library
else {
bNeedFree = true;
- sid.hDefaultIcon = ImageList_GetIcon(hIml, 0, ILD_NORMAL);;
+ sid.hDefaultIcon = ImageList_GetIcon(hIml, 0, ILD_NORMAL);
sid.iDefaultIndex = -1;
}
}
diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 57df8cd08d..836a52ce8a 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -413,7 +413,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) opt.UpdateOnlyConditionChanged = (BYTE)IsDlgButtonChecked(hdlg, IDC_UPDCONDCHG);
opt.RemoveOldData = IsDlgButtonChecked(hdlg, IDC_REMOVEOLD);
opt.MakeItalic = IsDlgButtonChecked(hdlg, IDC_MAKEI);
- opt.AvatarSize = GetDlgItemInt(hdlg, IDC_AVATARSIZE, NULL, FALSE);;
+ opt.AvatarSize = GetDlgItemInt(hdlg, IDC_AVATARSIZE, NULL, FALSE);
opt.DoNotAppendUnit = IsDlgButtonChecked(hdlg, IDC_DONOTAPPUNITS);
opt.NoFrac = IsDlgButtonChecked(hdlg, IDC_NOFRAC);
UpdateMenu(opt.AutoUpdate);
diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp index 3ef1d03f45..892d812b3a 100644 --- a/plugins/YAMN/src/browser/mailbrowser.cpp +++ b/plugins/YAMN/src/browser/mailbrowser.cpp @@ -1516,7 +1516,7 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg,UINT msg,WPARAM wParam,LPARAM //but we have only one static control (for now);
SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW));
SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));
- return (INT_PTR)GetSysColorBrush(COLOR_WINDOW);;
+ return (INT_PTR)GetSysColorBrush(COLOR_WINDOW);
case WM_DESTROY:
{
diff --git a/plugins/YAMN/src/services.cpp b/plugins/YAMN/src/services.cpp index 6147b69979..21d565ba4d 100644 --- a/plugins/YAMN/src/services.cpp +++ b/plugins/YAMN/src/services.cpp @@ -39,7 +39,7 @@ static INT_PTR Service_SetStatus(WPARAM wParam, LPARAM lParam) static INT_PTR Service_GetName(WPARAM wParam, LPARAM lParam)
{
- lstrcpynA((char *) lParam, YAMN_DBMODULE, wParam);;
+ lstrcpynA((char *) lParam, YAMN_DBMODULE, wParam);
return 0;
}
diff --git a/protocols/JabberG/src/ui_utils.cpp b/protocols/JabberG/src/ui_utils.cpp index 2e51880d81..aa3d67891d 100644 --- a/protocols/JabberG/src/ui_utils.cpp +++ b/protocols/JabberG/src/ui_utils.cpp @@ -2523,7 +2523,7 @@ void CProtoIntDlgBase::UpdateProtoTitle(TCHAR *szText) if (szText)
{
curText = szText;
- curLength = lstrlen(curText);;
+ curLength = lstrlen(curText);
} else
{
curLength = GetWindowTextLength(m_hwnd) + 1;
diff --git a/protocols/MSN/src/msn_avatar.cpp b/protocols/MSN/src/msn_avatar.cpp index eae7364de7..db57bf4769 100644 --- a/protocols/MSN/src/msn_avatar.cpp +++ b/protocols/MSN/src/msn_avatar.cpp @@ -59,7 +59,7 @@ bool CMsnProto::loadHttpAvatar(AvatarQueueEntry *p) NETLIBHTTPREQUEST nlhr = { sizeof(nlhr) };
nlhr.requestType = REQUEST_GET;
- nlhr.flags = NLHRF_HTTP11 | NLHRF_REDIRECT;;
+ nlhr.flags = NLHRF_HTTP11 | NLHRF_REDIRECT;
nlhr.szUrl = p->pszUrl;
nlhr.headers = (NETLIBHTTPHEADER*)&nlbhHeaders;
nlhr.headersCount = 1;
diff --git a/protocols/Tlen/src/tlen_p2p_new.cpp b/protocols/Tlen/src/tlen_p2p_new.cpp index c8a9c49ea2..80021fb004 100644 --- a/protocols/Tlen/src/tlen_p2p_new.cpp +++ b/protocols/Tlen/src/tlen_p2p_new.cpp @@ -177,7 +177,7 @@ void TlenBindUDPSocket(TLEN_FILE_TRANSFER *ft) int len = sizeof(struct sockaddr);
memset((char *)&sin,0,sizeof(sin));
sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = htonl(INADDR_ANY);;
+ sin.sin_addr.s_addr = htonl(INADDR_ANY);
sin.sin_port = 0;
if (bind(ft->udps, (struct sockaddr *)&sin, sizeof(sin)) >= 0) {
if (!getsockname((SOCKET)ft->udps,(SOCKADDR *)&sin,&len)) {
diff --git a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp index 343f7bd1f5..9caf489f97 100644 --- a/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp +++ b/protocols/WhatsApp/src/WhatsAPI++/WAConnection.cpp @@ -561,7 +561,7 @@ void WAConnection::sendMessageWithMedia(FMessage* message) throw (WAException) if (message->media_wa_type == FMessage::WA_TYPE_LOCATION) {
(*attribs)["latitude"] = Utilities::doubleToStr(message->latitude);
- (*attribs)["longitude"] = Utilities::doubleToStr(message->longitude);;
+ (*attribs)["longitude"] = Utilities::doubleToStr(message->longitude);
} else {
if (message->media_wa_type != FMessage::WA_TYPE_CONTACT && !message->media_name.empty() && !message->media_url.empty() && message->media_size > 0L) {
(*attribs)["file"] = message->media_name;
diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index 24df024eb6..d8c321b201 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -739,7 +739,7 @@ void CYahooProto::ext_rejected(const char *who, const char *msg) void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status, int auth)
{
- HANDLE hContact=getbuddyH(who);;
+ HANDLE hContact=getbuddyH(who);
LOG(("[ext_buddy_added] %s authorized you as %s group: %s status: %d auth: %d", who, myid, group, status, auth));
diff --git a/src/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp index 2d265591f7..a244d2a93b 100644 --- a/src/core/stdauth/authdialogs.cpp +++ b/src/core/stdauth/authdialogs.cpp @@ -273,7 +273,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP CallProtoService(dbei.szModule, PS_AUTHDENYT, (WPARAM)hDbEvent, 0);
}
DestroyWindow(hwndDlg);
- break;;
+ break;
}
break;
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index 3308ceb167..05dbc4e997 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -1107,7 +1107,7 @@ static int RestoreWindowPosition(HWND hwnd, HANDLE hContact, char * szModule, ch {
WINDOWPLACEMENT wp;
char szSettingName[64];
- int x,y, width, height;;
+ int x,y, width, height;
wp.length=sizeof(wp);
GetWindowPlacement(hwnd,&wp);
diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp index 12ccf08593..3a43f4ef8d 100644 --- a/src/core/stdmsg/src/cmdlist.cpp +++ b/src/core/stdmsg/src/cmdlist.cpp @@ -109,7 +109,7 @@ void msgQueue_add(HANDLE hContact, int id, const TCHAR* szMsg, HANDLE hDbEvent) void msgQueue_processack(HANDLE hContact, int id, BOOL success, const char* szErr)
{
int i;
- TMsgQueue* item = NULL;;
+ TMsgQueue* item = NULL;
EnterCriticalSection(&csMsgQueue);
diff --git a/src/modules/fonts/FontOptions.cpp b/src/modules/fonts/FontOptions.cpp index beb9f5f3ee..694eb01ad9 100644 --- a/src/modules/fonts/FontOptions.cpp +++ b/src/modules/fonts/FontOptions.cpp @@ -505,7 +505,7 @@ static INT_PTR CALLBACK ChooseEffectDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wPar int i = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COMBO, CB_GETCURSEL, 0, 0);
pEffect->effectIndex = (BYTE)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COMBO, CB_GETITEMDATA, i, 0);
pEffect->baseColour = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR1, CPM_GETCOLOUR, 0, 0)|((~(BYTE)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN1, UDM_GETPOS, 0, 0))<<24);
- pEffect->secondaryColour = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR2, CPM_GETCOLOUR, 0, 0)|((~(BYTE)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN2, UDM_GETPOS, 0, 0))<<24);;
+ pEffect->secondaryColour = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR2, CPM_GETCOLOUR, 0, 0)|((~(BYTE)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN2, UDM_GETPOS, 0, 0))<<24);
}
EndDialog(hwndDlg, IDOK);
return TRUE;
@@ -1258,7 +1258,7 @@ int OptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = {0};
odp.cbSize = sizeof(odp);
odp.position = -790000000;
- odp.hInstance = hInst;;
+ odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FONTS);
odp.pszTitle = LPGEN("Fonts & Colors");
odp.pszGroup = LPGEN("Customize");
diff --git a/src/modules/fonts/services.cpp b/src/modules/fonts/services.cpp index d9cbd1a964..adccb3b8fe 100644 --- a/src/modules/fonts/services.cpp +++ b/src/modules/fonts/services.cpp @@ -216,7 +216,7 @@ int CreateFromFontSettings(FontSettingsT* fs, LOGFONT* lf) lf->lfWeight = fs->style & DBFONTF_BOLD ? FW_BOLD : FW_NORMAL;
lf->lfItalic = (fs->style & DBFONTF_ITALIC) != 0;
lf->lfUnderline = (fs->style & DBFONTF_UNDERLINE) != 0;
- lf->lfStrikeOut = (fs->style & DBFONTF_STRIKEOUT) != 0;;
+ lf->lfStrikeOut = (fs->style & DBFONTF_STRIKEOUT) != 0;
lf->lfCharSet = fs->charset;
lf->lfOutPrecision = OUT_DEFAULT_PRECIS;
lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;
diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index 6fba0160f4..da68984d7c 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.cpp @@ -438,7 +438,7 @@ INT_PTR CallProtoServiceInt(HANDLE hContact, const char *szModule, const char *s }
case 12: return (INT_PTR)ppi->GetCaps(wParam, (HANDLE)lParam);
case 13: return (INT_PTR)Proto_GetIcon(ppi, wParam);
- case 14: return (INT_PTR)ppi->GetInfo(hContact, wParam);;
+ case 14: return (INT_PTR)ppi->GetInfo(hContact, wParam);
case 15:
if (ppi->m_iVersion > 1)
return (INT_PTR)ppi->SearchBasic(StrConvT((char*)lParam));
|