diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp index 6cc5913c9..61cccc793 100644 --- a/PowerEditor/src/MISC/Common/Common.cpp +++ b/PowerEditor/src/MISC/Common/Common.cpp @@ -557,7 +557,7 @@ generic_string PathRemoveFileSpec(generic_string & path) return path; } -generic_string PathAppend(generic_string &strDest, const generic_string str2append) +generic_string PathAppend(generic_string &strDest, const generic_string & str2append) { if (strDest == TEXT("") && str2append == TEXT("")) // "" + "" { diff --git a/PowerEditor/src/MISC/Common/Common.h b/PowerEditor/src/MISC/Common/Common.h index c33ca0480..16154dd98 100644 --- a/PowerEditor/src/MISC/Common/Common.h +++ b/PowerEditor/src/MISC/Common/Common.h @@ -177,7 +177,7 @@ private: #endif generic_string PathRemoveFileSpec(generic_string & path); -generic_string PathAppend(generic_string &strDest, const generic_string str2append); +generic_string PathAppend(generic_string &strDest, const generic_string & str2append); COLORREF getCtrlBkColor(HWND hWnd); #endif //M30_IDE_COMMUN_H diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index dc915f697..3aaccdc5c 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -40,7 +40,7 @@ void Notepad_plus::macroPlayback(Macro macro) { _pEditView->execute(SCI_BEGINUNDOACTION); - for (Macro::iterator step = macro.begin(); step != macro.end(); step++) + for (Macro::iterator step = macro.begin(); step != macro.end(); ++step) { if (step->isPlayable()) step->PlayBack(this->_pPublicInterface, _pEditView); diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index d3e1f79b8..7fb9a66db 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -331,7 +331,7 @@ void FindReplaceDlg::fillComboHistory(int id, const vector & str bool isUnicode = false; HWND hCombo = ::GetDlgItem(_hSelf, id); - for (vector::const_reverse_iterator i = strings.rbegin() ; i != strings.rend(); i++) + for (vector::const_reverse_iterator i = strings.rbegin() ; i != strings.rend(); ++i) { addText2Combo(i->c_str(), hCombo, isUnicode); } diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 6517bdf43..c5ce02a9b 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -711,7 +711,7 @@ void WordStyleDlg::setVisualFromStyleList() //--Warning text //bool showWarning = ((_currentLexerIndex == 0) && (style._styleID == STYLE_DEFAULT));//?SW_SHOW:SW_HIDE; - COLORREF c = c = RGB(0x00, 0x00, 0xFF); + COLORREF c = RGB(0x00, 0x00, 0xFF); TCHAR str[256]; str[0] = '\0'; diff --git a/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp b/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp index 4bf1cac8f..aaeea3489 100644 --- a/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp +++ b/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp @@ -40,7 +40,7 @@ void TreeView::init(HINSTANCE hInst, HWND parent, int treeViewID) WC_TREEVIEW, TEXT("Tree View"), WS_CHILD | WS_BORDER | WS_HSCROLL | WS_TABSTOP | TVS_LINESATROOT | TVS_HASLINES | - TVS_HASBUTTONS | TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_INFOTIP, + TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_INFOTIP, 0, 0, 0, 0, _hParent, NULL, diff --git a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp index 14932e978..8683c65c0 100644 --- a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp +++ b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp @@ -112,7 +112,7 @@ void StaticDialog::create(int dialogID, bool isRTL, bool msgDestParent) { DWORD err = ::GetLastError(); char errMsg[256]; - sprintf(errMsg, "CreateDialogParam() return NULL.\rGetLastError() == %d", err); + sprintf(errMsg, "CreateDialogParam() return NULL.\rGetLastError() == %u", err); ::MessageBoxA(NULL, errMsg, "In StaticDialog::create()", MB_OK); return; }