From 385746de01d7b337682ec0283d34e65638a47320 Mon Sep 17 00:00:00 2001 From: Don HO Date: Thu, 27 Jul 2017 10:30:53 +0200 Subject: [PATCH] Rename variables & clean up --- PowerEditor/src/Notepad_plus.cpp | 4 +- PowerEditor/src/NppBigSwitch.cpp | 4 +- PowerEditor/src/NppIO.cpp | 4 +- PowerEditor/src/Parameters.cpp | 8 +- PowerEditor/src/ScitillaComponent/Buffer.cpp | 22 ++--- PowerEditor/src/ScitillaComponent/Buffer.h | 4 +- .../src/ScitillaComponent/FunctionCallTip.cpp | 24 +++--- .../src/ScitillaComponent/FunctionCallTip.h | 2 +- .../ScitillaComponent/ScintillaEditView.cpp | 6 +- .../ScitillaComponent/SmartHighlighter.cpp | 4 +- PowerEditor/src/WinControls/Grid/BabyGrid.cpp | 83 ------------------- .../src/WinControls/Grid/ShortcutMapper.cpp | 60 +++++++------- .../src/WinControls/ToolBar/ToolBar.cpp | 36 ++++---- PowerEditor/src/WinControls/ToolBar/ToolBar.h | 8 +- .../src/WinControls/shortcut/shortcut.cpp | 33 ++------ PowerEditor/src/winmain.cpp | 66 +++++++-------- 16 files changed, 131 insertions(+), 237 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 21469ef32..f8bddff90 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -1906,7 +1906,7 @@ void Notepad_plus::checkDocState() bool isFileExisting = PathFileExists(curBuf->getFullPathName()) != FALSE; if (!isCurrentDirty) { - for (size_t i = 0; i < MainFileManager->getNrBuffers(); ++i) + for (size_t i = 0; i < MainFileManager->getNbBuffers(); ++i) { if (MainFileManager->getBufferByIndex(i)->isDirty()) { @@ -4959,7 +4959,7 @@ bool Notepad_plus::dumpFiles(const TCHAR * outdir, const TCHAR * fileprefix) { TCHAR savePath[MAX_PATH] = {0}; //rescue primary - for (size_t i = 0; i < MainFileManager->getNrBuffers(); ++i) + for (size_t i = 0; i < MainFileManager->getNbBuffers(); ++i) { Buffer * docbuf = MainFileManager->getBufferByIndex(i); if (!docbuf->isDirty()) //skip saved documents diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index a7f8d21c1..6beaa600e 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -177,7 +177,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa generic_string name{userLangName}; //loop through buffers and reset the language (L_USER, TEXT("")) if (L_USER, name) - for (size_t i = 0; i < MainFileManager->getNrBuffers(); ++i) + for (size_t i = 0; i < MainFileManager->getNbBuffers(); ++i) { Buffer* buf = MainFileManager->getBufferByIndex(i); if (buf->getLangType() == L_USER && name == buf->getUserDefineLangName()) @@ -195,7 +195,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa generic_string newName{ reinterpret_cast(wParam) }; //loop through buffers and reset the language (L_USER, newName) if (L_USER, oldName) - for (size_t i = 0; i < MainFileManager->getNrBuffers(); ++i) + for (size_t i = 0; i < MainFileManager->getNbBuffers(); ++i) { Buffer* buf = MainFileManager->getBufferByIndex(i); if (buf->getLangType() == L_USER && oldName == buf->getUserDefineLangName()) diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp index c4e6f2a69..87d156037 100644 --- a/PowerEditor/src/NppIO.cpp +++ b/PowerEditor/src/NppIO.cpp @@ -643,7 +643,7 @@ void Notepad_plus::doClose(BufferID id, int whichOne, bool doDeleteBackup) } } - size_t nrDocs = whichOne==MAIN_VIEW?(_mainDocTab.nbItem()):(_subDocTab.nbItem()); + size_t nbDocs = whichOne==MAIN_VIEW?(_mainDocTab.nbItem()):(_subDocTab.nbItem()); if (buf->isMonitoringOn()) { @@ -658,7 +658,7 @@ void Notepad_plus::doClose(BufferID id, int whichOne, bool doDeleteBackup) //Do all the works bool isBufRemoved = removeBufferFromView(id, whichOne); BufferID hiddenBufferID = BUFFER_INVALID; - if (nrDocs == 1 && canHideView(whichOne)) + if (nbDocs == 1 && canHideView(whichOne)) { //close the view if both visible hideView(whichOne); diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 9d5fd609d..9ba6ca9b1 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -1709,9 +1709,9 @@ bool NppParameters::getBlackListFromXmlTree() void NppParameters::initMenuKeys() { - int nrCommands = sizeof(winKeyDefs)/sizeof(WinMenuKeyDefinition); + int nbCommands = sizeof(winKeyDefs)/sizeof(WinMenuKeyDefinition); WinMenuKeyDefinition wkd; - for(int i = 0; i < nrCommands; ++i) + for(int i = 0; i < nbCommands; ++i) { wkd = winKeyDefs[i]; Shortcut sc((wkd.specialName ? wkd.specialName : TEXT("")), wkd.isCtrl, wkd.isAlt, wkd.isShift, static_cast(wkd.vKey)); @@ -1721,13 +1721,13 @@ void NppParameters::initMenuKeys() void NppParameters::initScintillaKeys() { - int nrCommands = sizeof(scintKeyDefs)/sizeof(ScintillaKeyDefinition); + int nbCommands = sizeof(scintKeyDefs)/sizeof(ScintillaKeyDefinition); //Warning! Matching function have to be consecutive ScintillaKeyDefinition skd; int prevIndex = -1; int prevID = -1; - for(int i = 0; i < nrCommands; ++i) + for(int i = 0; i < nbCommands; ++i) { skd = scintKeyDefs[i]; if (skd.functionId == prevID) diff --git a/PowerEditor/src/ScitillaComponent/Buffer.cpp b/PowerEditor/src/ScitillaComponent/Buffer.cpp index 0882d70a8..a6c0fb45b 100644 --- a/PowerEditor/src/ScitillaComponent/Buffer.cpp +++ b/PowerEditor/src/ScitillaComponent/Buffer.cpp @@ -489,14 +489,14 @@ void FileManager::init(Notepad_plus * pNotepadPlus, ScintillaEditView * pscratch void FileManager::checkFilesystemChanges() { - for (int i = int(_nrBufs) - 1; i >= 0 ; i--) + for (int i = int(_nbBufs) - 1; i >= 0 ; i--) { - if (i >= int(_nrBufs)) + if (i >= int(_nbBufs)) { - if (_nrBufs == 0) + if (_nbBufs == 0) return; - i = int(_nrBufs) - 1; + i = int(_nbBufs) - 1; } _buffers[i]->checkFileState(); //something has changed. Triggers update automatically } @@ -505,7 +505,7 @@ void FileManager::checkFilesystemChanges() int FileManager::getBufferIndexByID(BufferID id) { - for(size_t i = 0; i < _nrBufs; ++i) + for(size_t i = 0; i < _nbBufs; ++i) { if (_buffers[i]->_id == id) return static_cast(i); @@ -546,7 +546,7 @@ void FileManager::closeBuffer(BufferID id, ScintillaEditView * identifier) _pscratchTilla->execute(SCI_RELEASEDOCUMENT, 0, buf->_doc); //release for FileManager, Document is now gone _buffers.erase(_buffers.begin() + index); delete buf; - _nrBufs--; + _nbBufs--; } } @@ -597,8 +597,8 @@ BufferID FileManager::loadFile(const TCHAR * filename, Document doc, int encodin newBuf->_timeStamp = fileNameTimestamp; _buffers.push_back(newBuf); - ++_nrBufs; - Buffer* buf = _buffers.at(_nrBufs - 1); + ++_nbBufs; + Buffer* buf = _buffers.at(_nbBufs - 1); // restore the encoding (ANSI based) while opening the existing file NppParameters *pNppParamInst = NppParameters::getInstance(); @@ -1196,7 +1196,7 @@ BufferID FileManager::newEmptyDocument() BufferID id = static_cast(newBuf); newBuf->_id = id; _buffers.push_back(newBuf); - ++_nrBufs; + ++_nbBufs; ++_nextBufferID; return id; } @@ -1214,7 +1214,7 @@ BufferID FileManager::bufferFromDocument(Document doc, bool dontIncrease, bool d BufferID id = static_cast(newBuf); newBuf->_id = id; _buffers.push_back(newBuf); - ++_nrBufs; + ++_nbBufs; if (!dontIncrease) ++_nextBufferID; @@ -1517,7 +1517,7 @@ BufferID FileManager::getBufferFromName(const TCHAR* name) BufferID FileManager::getBufferFromDocument(Document doc) { - for (size_t i = 0; i < _nrBufs; ++i) + for (size_t i = 0; i < _nbBufs; ++i) { if (_buffers[i]->_doc == doc) return _buffers[i]->_id; diff --git a/PowerEditor/src/ScitillaComponent/Buffer.h b/PowerEditor/src/ScitillaComponent/Buffer.h index 33f93090b..49a3257bd 100644 --- a/PowerEditor/src/ScitillaComponent/Buffer.h +++ b/PowerEditor/src/ScitillaComponent/Buffer.h @@ -76,7 +76,7 @@ public: //void activateBuffer(int index); void checkFilesystemChanges(); - size_t getNrBuffers() { return _nrBufs; }; + size_t getNbBuffers() { return _nbBufs; }; int getBufferIndexByID(BufferID id); Buffer * getBufferByIndex(size_t index); Buffer * getBufferByID(BufferID id) {return static_cast(id);} @@ -127,7 +127,7 @@ private: Document _scratchDocDefault; std::vector _buffers; BufferID _nextBufferID = 0; - size_t _nrBufs = 0; + size_t _nbBufs = 0; }; #define MainFileManager FileManager::getInstance() diff --git a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp index 1bd83fee1..1a07b8aa6 100644 --- a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp +++ b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp @@ -111,14 +111,14 @@ bool FunctionCallTip::updateCalltip(int ch, bool needShown) void FunctionCallTip::showNextOverload() { if (!isVisible()) return; - _currentOverload = (_currentOverload+1) % _currentNrOverloads; + _currentOverload = (_currentOverload+1) % _currentNbOverloads; showCalltip(); } void FunctionCallTip::showPrevOverload() { if (!isVisible()) return; - _currentOverload = _currentOverload > 0 ? (_currentOverload-1) : (_currentNrOverloads-1); + _currentOverload = _currentOverload > 0 ? (_currentOverload-1) : (_currentNbOverloads-1); showCalltip(); } @@ -363,12 +363,12 @@ bool FunctionCallTip::loadFunction() _overloads.push_back(paramVec); paramVec.clear(); - ++_currentNrOverloads; + ++_currentNbOverloads; } - _currentNrOverloads = _overloads.size(); + _currentNbOverloads = _overloads.size(); - if (_currentNrOverloads == 0) //malformed node + if (_currentNbOverloads == 0) //malformed node return false; return true; @@ -376,7 +376,7 @@ bool FunctionCallTip::loadFunction() void FunctionCallTip::showCalltip() { - if (_currentNrOverloads == 0) + if (_currentNbOverloads == 0) { //ASSERT return; @@ -401,17 +401,17 @@ void FunctionCallTip::showCalltip() generic_stringstream callTipText; - if (_currentNrOverloads > 1) + if (_currentNbOverloads > 1) { - callTipText << TEXT("\001") << _currentOverload + 1 << TEXT(" of ") << _currentNrOverloads << TEXT("\002"); + callTipText << TEXT("\001") << _currentOverload + 1 << TEXT(" of ") << _currentNbOverloads << TEXT("\002"); } callTipText << _retVals.at(_currentOverload) << TEXT(' ') << _funcName << TEXT(' ') << _start; int highlightstart = 0; int highlightend = 0; - size_t nrParams = params.size(); - for (size_t i = 0; i < nrParams; ++i) + size_t nbParams = params.size(); + for (size_t i = 0; i < nbParams; ++i) { if (int(i) == _currentParam) { @@ -419,7 +419,7 @@ void FunctionCallTip::showCalltip() highlightend = highlightstart + lstrlen(params.at(i)); } callTipText << params.at(i); - if (i < nrParams - 1) + if (i < nbParams - 1) callTipText << _param << TEXT(' '); } @@ -448,7 +448,7 @@ void FunctionCallTip::reset() { //_curPos = 0; _startPos = 0; _overloads.clear(); - _currentNrOverloads = 0; + _currentNbOverloads = 0; _retVals.clear(); _descriptions.clear(); } diff --git a/PowerEditor/src/ScitillaComponent/FunctionCallTip.h b/PowerEditor/src/ScitillaComponent/FunctionCallTip.h index aebc815ca..3e7678419 100644 --- a/PowerEditor/src/ScitillaComponent/FunctionCallTip.h +++ b/PowerEditor/src/ScitillaComponent/FunctionCallTip.h @@ -59,7 +59,7 @@ private: stringVec _retVals; //vector of overload return values/types std::vector _overloads; //vector of overload params (=vector) stringVec _descriptions; //vecotr of function descriptions - size_t _currentNrOverloads = 0; //current amount of overloads + size_t _currentNbOverloads = 0; //current amount of overloads size_t _currentOverload = 0; //current chosen overload int _currentParam = 0; //current highlighted param diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index beea7db3a..21ba51ae4 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -3089,12 +3089,12 @@ void ScintillaEditView::hideLines() int endLine = static_cast(execute(SCI_LINEFROMPOSITION, execute(SCI_GETSELECTIONEND))); //perform range check: cannot hide very first and very last lines //Offset them one off the edges, and then check if they are within the reasonable - int nrLines = static_cast(execute(SCI_GETLINECOUNT)); - if (nrLines < 3) + int nbLines = static_cast(execute(SCI_GETLINECOUNT)); + if (nbLines < 3) return; //cannot possibly hide anything if (!startLine) ++startLine; - if (endLine == (nrLines-1)) + if (endLine == (nbLines-1)) --endLine; if (startLine > endLine) diff --git a/PowerEditor/src/ScitillaComponent/SmartHighlighter.cpp b/PowerEditor/src/ScitillaComponent/SmartHighlighter.cpp index debe13410..f61e23f93 100644 --- a/PowerEditor/src/ScitillaComponent/SmartHighlighter.cpp +++ b/PowerEditor/src/ScitillaComponent/SmartHighlighter.cpp @@ -46,8 +46,8 @@ void SmartHighlighter::highlightViewWithWord(ScintillaEditView * pHighlightView, // Get the range of text visible and highlight everything in it auto firstLine = static_cast(pHighlightView->execute(SCI_GETFIRSTVISIBLELINE)); auto nbLineOnScreen = pHighlightView->execute(SCI_LINESONSCREEN); - auto nrLines = min(nbLineOnScreen, MAXLINEHIGHLIGHT) + 1; - auto lastLine = firstLine + nrLines; + auto nbLines = min(nbLineOnScreen, MAXLINEHIGHLIGHT) + 1; + auto lastLine = firstLine + nbLines; int startPos = 0; int endPos = 0; auto currentLine = firstLine; diff --git a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp index 75b2674f9..9569e0de9 100644 --- a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp +++ b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp @@ -3020,89 +3020,6 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } break; -/* case WM_SIZE: //obsolete - { - static int SI,cheight; - static int savewidth,saveheight; - int intin,intout; - SI=SelfIndex; - - - - - - if(BGHS[SI].SIZING) - { - BGHS[SI].SIZING = FALSE; - break; - } - ShowHscroll(hWnd,SI); - ShowVscroll(hWnd,SI); - - if((BGHS[SI].SHOWINTEGRALROWS)&&(BGHS[SI].VSCROLL)) - { - saveheight=HIWORD(lParam); - intin=saveheight; - savewidth=LOWORD(lParam); - cheight=HIWORD(lParam); - cheight-=BGHS[SI].titleheight; - cheight-=BGHS[SI].headerrowheight; - - { - int sbheight; - sbheight=GetSystemMetrics(SM_CYHSCROLL); - if(BGHS[SI].HSCROLL) - { - cheight-=sbheight; - } - if(BGHS[SI].VSCROLL) - { - RECT grect,prect; - GetClientRect(hWnd,&grect); - GetClientRect(GetParent(hWnd),&prect); - if((grect.right+sbheight) < prect.right) - { - savewidth+=sbheight; - } - } - - } - - - - if(cheight <= BGHS[SI].rowheight) - { - break; - } - else - { - //calculate fractional part of cheight/rowheight - int remainder,nrows; - nrows=(int)(cheight/BGHS[SI].rowheight); - remainder=cheight-(nrows * BGHS[SI].rowheight); - //make the window remainder pixels shorter - saveheight -= remainder; - saveheight +=4; //+=4 - intout=saveheight; - WINDOWPLACEMENT wp; - RECT crect; - wp.length = sizeof(wp); - GetWindowPlacement(hWnd,&wp); - crect=wp.rcNormalPosition; - crect.bottom=intout; - //crect.bottom = NppParameters::getInstance()->_dpiManager.ScaleY(intout); - crect.right=savewidth; - BGHS[SI].SIZING = TRUE; - - BGHS[SI].wannabeheight = HIWORD(lParam); - BGHS[SI].wannabewidth = LOWORD(lParam); - //NppParameters::getInstance()->_dpiManager.ScaleRect(&crect); - MoveWindow(hWnd,crect.left,crect.top,crect.right,crect.bottom,TRUE); - } - } - - } - break; */ case WM_CREATE: lpcs = (LPCREATESTRUCT)lParam; diff --git a/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp b/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp index 9583dfa38..957c8dca1 100644 --- a/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp +++ b/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp @@ -128,28 +128,28 @@ void ShortcutMapper::fillOutBabyGrid() _babygrid.clear(); _babygrid.setInitialContent(true); - size_t nrItems = 0; + size_t nbItems = 0; switch(_currentState) { case STATE_MENU: { - nrItems = nppParam->getUserShortcuts().size(); - _babygrid.setLineColNumber(nrItems, 2); + nbItems = nppParam->getUserShortcuts().size(); + _babygrid.setLineColNumber(nbItems, 2); break; } case STATE_MACRO: { - nrItems = nppParam->getMacroList().size(); - _babygrid.setLineColNumber(nrItems, 2); + nbItems = nppParam->getMacroList().size(); + _babygrid.setLineColNumber(nbItems, 2); break; } case STATE_USER: { - nrItems = nppParam->getUserCommandList().size(); - _babygrid.setLineColNumber(nrItems, 2); + nbItems = nppParam->getUserCommandList().size(); + _babygrid.setLineColNumber(nbItems, 2); break; } case STATE_PLUGIN: { - nrItems = nppParam->getPluginCommandList().size(); - _babygrid.setLineColNumber(nrItems, 2); + nbItems = nppParam->getPluginCommandList().size(); + _babygrid.setLineColNumber(nbItems, 2); break; } case STATE_SCINTILLA: { - nrItems = nppParam->getScintillaKeyList().size(); - _babygrid.setLineColNumber(nrItems, 2); + nbItems = nppParam->getScintillaKeyList().size(); + _babygrid.setLineColNumber(nbItems, 2); break; } } @@ -161,7 +161,7 @@ void ShortcutMapper::fillOutBabyGrid() switch(_currentState) { case STATE_MENU: { vector & cshortcuts = nppParam->getUserShortcuts(); - for(size_t i = 0; i < nrItems; ++i) + for(size_t i = 0; i < nbItems; ++i) { if (findKeyConflicts(nullptr, cshortcuts[i].getKeyCombo(), i)) isMarker = _babygrid.setMarker(true); @@ -179,7 +179,7 @@ void ShortcutMapper::fillOutBabyGrid() break; } case STATE_MACRO: { vector & cshortcuts = nppParam->getMacroList(); - for(size_t i = 0; i < nrItems; ++i) + for(size_t i = 0; i < nbItems; ++i) { if (findKeyConflicts(nullptr, cshortcuts[i].getKeyCombo(), i)) isMarker = _babygrid.setMarker(true); @@ -191,14 +191,14 @@ void ShortcutMapper::fillOutBabyGrid() if (isMarker) isMarker = _babygrid.setMarker(false); } - bool shouldBeEnabled = nrItems > 0; + bool shouldBeEnabled = nbItems > 0; ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_MODIFY), shouldBeEnabled); ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_CLEAR), shouldBeEnabled); ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_DELETE), shouldBeEnabled); break; } case STATE_USER: { vector & cshortcuts = nppParam->getUserCommandList(); - for(size_t i = 0; i < nrItems; ++i) + for(size_t i = 0; i < nbItems; ++i) { if (findKeyConflicts(nullptr, cshortcuts[i].getKeyCombo(), i)) isMarker = _babygrid.setMarker(true); @@ -210,14 +210,14 @@ void ShortcutMapper::fillOutBabyGrid() if (isMarker) isMarker = _babygrid.setMarker(false); } - bool shouldBeEnabled = nrItems > 0; + bool shouldBeEnabled = nbItems > 0; ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_MODIFY), shouldBeEnabled); ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_CLEAR), shouldBeEnabled); ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_DELETE), shouldBeEnabled); break; } case STATE_PLUGIN: { vector & cshortcuts = nppParam->getPluginCommandList(); - for(size_t i = 0; i < nrItems; ++i) + for(size_t i = 0; i < nbItems; ++i) { if (findKeyConflicts(nullptr, cshortcuts[i].getKeyCombo(), i)) isMarker = _babygrid.setMarker(true); @@ -229,14 +229,14 @@ void ShortcutMapper::fillOutBabyGrid() if (isMarker) isMarker = _babygrid.setMarker(false); } - bool shouldBeEnabled = nrItems > 0; + bool shouldBeEnabled = nbItems > 0; ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_MODIFY), shouldBeEnabled); ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_CLEAR), shouldBeEnabled); ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_DELETE), false); break; } case STATE_SCINTILLA: { vector & cshortcuts = nppParam->getScintillaKeyList(); - for(size_t i = 0; i < nrItems; ++i) + for(size_t i = 0; i < nbItems; ++i) { if (cshortcuts[i].isEnabled()) { @@ -263,7 +263,7 @@ void ShortcutMapper::fillOutBabyGrid() ::EnableWindow(::GetDlgItem(_hSelf, IDM_BABYGRID_DELETE), false); break; } } - if (nrItems > 0) + if (nbItems > 0) //restore the last view _babygrid.setLastView(_lastHomeRow[_currentState], _lastCursorRow[_currentState]); else @@ -882,8 +882,8 @@ bool ShortcutMapper::findKeyConflicts(__inout_opt generic_string * const keyConf case STATE_MENU: { vector & vShortcuts = nppParam->getUserShortcuts(); - size_t nrItems = vShortcuts.size(); - for (size_t itemIndex = 0; itemIndex < nrItems; ++itemIndex) + size_t nbItems = vShortcuts.size(); + for (size_t itemIndex = 0; itemIndex < nbItems; ++itemIndex) { if (not vShortcuts[itemIndex].isEnabled()) //no key assignment continue; @@ -916,8 +916,8 @@ bool ShortcutMapper::findKeyConflicts(__inout_opt generic_string * const keyConf case STATE_MACRO: { vector & vShortcuts = nppParam->getMacroList(); - size_t nrItems = vShortcuts.size(); - for (size_t itemIndex = 0; itemIndex < nrItems; ++itemIndex) + size_t nbItems = vShortcuts.size(); + for (size_t itemIndex = 0; itemIndex < nbItems; ++itemIndex) { if (not vShortcuts[itemIndex].isEnabled()) //no key assignment continue; @@ -950,8 +950,8 @@ bool ShortcutMapper::findKeyConflicts(__inout_opt generic_string * const keyConf case STATE_USER: { vector & vShortcuts = nppParam->getUserCommandList(); - size_t nrItems = vShortcuts.size(); - for (size_t itemIndex = 0; itemIndex < nrItems; ++itemIndex) + size_t nbItems = vShortcuts.size(); + for (size_t itemIndex = 0; itemIndex < nbItems; ++itemIndex) { if (not vShortcuts[itemIndex].isEnabled()) //no key assignment continue; @@ -984,8 +984,8 @@ bool ShortcutMapper::findKeyConflicts(__inout_opt generic_string * const keyConf case STATE_PLUGIN: { vector & vShortcuts = nppParam->getPluginCommandList(); - size_t nrItems = vShortcuts.size(); - for (size_t itemIndex = 0; itemIndex < nrItems; ++itemIndex) + size_t nbItems = vShortcuts.size(); + for (size_t itemIndex = 0; itemIndex < nbItems; ++itemIndex) { if (not vShortcuts[itemIndex].isEnabled()) //no key assignment continue; @@ -1018,8 +1018,8 @@ bool ShortcutMapper::findKeyConflicts(__inout_opt generic_string * const keyConf case STATE_SCINTILLA: { vector & vShortcuts = nppParam->getScintillaKeyList(); - size_t nrItems = vShortcuts.size(); - for (size_t itemIndex = 0; itemIndex < nrItems; ++itemIndex) + size_t nbItems = vShortcuts.size(); + for (size_t itemIndex = 0; itemIndex < nbItems; ++itemIndex) { if (not vShortcuts[itemIndex].isEnabled()) //no key assignment continue; diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp index 66efe3ee8..9e02c5abe 100644 --- a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp +++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp @@ -120,15 +120,15 @@ bool ToolBar::init( HINSTANCE hInst, HWND hPere, toolBarStatusType type, InitCommonControlsEx(&icex); //Create the list of buttons - _nrButtons = arraySize; - _nrDynButtons = _vDynBtnReg.size(); - _nrTotalButtons = _nrButtons + (_nrDynButtons ? _nrDynButtons + 1 : 0); - _pTBB = new TBBUTTON[_nrTotalButtons]; //add one for the extra separator + _nbButtons = arraySize; + _nbDynButtons = _vDynBtnReg.size(); + _nbTotalButtons = _nbButtons + (_nbDynButtons ? _nbDynButtons + 1 : 0); + _pTBB = new TBBUTTON[_nbTotalButtons]; //add one for the extra separator int cmd = 0; int bmpIndex = -1, style; size_t i = 0; - for (; i < _nrButtons ; ++i) + for (; i < _nbButtons ; ++i) { cmd = buttonUnitArray[i]._cmdID; if (cmd != 0) @@ -149,7 +149,7 @@ bool ToolBar::init( HINSTANCE hInst, HWND hPere, toolBarStatusType type, _pTBB[i].iString = 0; } - if (_nrDynButtons > 0) { + if (_nbDynButtons > 0) { //add separator _pTBB[i].iBitmap = 0; _pTBB[i].idCommand = 0; @@ -159,7 +159,7 @@ bool ToolBar::init( HINSTANCE hInst, HWND hPere, toolBarStatusType type, _pTBB[i].iString = 0; ++i; //add plugin buttons - for (size_t j = 0; j < _nrDynButtons ; ++j, ++i) + for (size_t j = 0; j < _nbDynButtons ; ++j, ++i) { cmd = _vDynBtnReg[j].message; ++bmpIndex; @@ -192,7 +192,7 @@ void ToolBar::destroy() { int ToolBar::getWidth() const { RECT btnRect; int totalWidth = 0; - for(size_t i = 0; i < _nrCurrentButtons; ++i) { + for(size_t i = 0; i < _nbCurrentButtons; ++i) { ::SendMessage(_hSelf, TB_GETITEMRECT, i, reinterpret_cast(&btnRect)); totalWidth += btnRect.right - btnRect.left; } @@ -249,7 +249,7 @@ void ToolBar::reset(bool create) if(create && _hSelf) { //Store current button state information TBBUTTON tempBtn; - for(size_t i = 0; i < _nrCurrentButtons; ++i) + for(size_t i = 0; i < _nbCurrentButtons; ++i) { ::SendMessage(_hSelf, TB_GETBUTTON, i, reinterpret_cast(&tempBtn)); _pTBB[i].fsState = tempBtn.fsState; @@ -298,7 +298,7 @@ void ToolBar::reset(bool create) //TBADDBITMAP addbmp = {_hInst, 0}; TBADDBITMAP addbmp = {0, 0}; TBADDBITMAP addbmpdyn = {0, 0}; - for (size_t i = 0 ; i < _nrButtons ; ++i) + for (size_t i = 0 ; i < _nbButtons ; ++i) { int icoID = _toolBarIcons.getStdIconAt(static_cast(i)); HBITMAP hBmp = static_cast(::LoadImage(_hInst, MAKEINTRESOURCE(icoID), IMAGE_BITMAP, iconDpiDynamicalSize, iconDpiDynamicalSize, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT)); @@ -307,9 +307,9 @@ void ToolBar::reset(bool create) //addbmp.nID = _toolBarIcons.getStdIconAt(i); ::SendMessage(_hSelf, TB_ADDBITMAP, 1, reinterpret_cast(&addbmp)); } - if (_nrDynButtons > 0) + if (_nbDynButtons > 0) { - for (size_t j = 0; j < _nrDynButtons; ++j) + for (size_t j = 0; j < _nbDynButtons; ++j) { addbmpdyn.nID = reinterpret_cast(_vDynBtnReg.at(j).hBmp); ::SendMessage(_hSelf, TB_ADDBITMAP, 1, reinterpret_cast(&addbmpdyn)); @@ -319,11 +319,11 @@ void ToolBar::reset(bool create) if (create) { //if the toolbar has been recreated, readd the buttons - size_t nrBtnToAdd = (_state == TB_STANDARD?_nrTotalButtons:_nrButtons); - _nrCurrentButtons = nrBtnToAdd; + size_t nbBtnToAdd = (_state == TB_STANDARD?_nbTotalButtons:_nbButtons); + _nbCurrentButtons = nbBtnToAdd; WORD btnSize = (_state == TB_LARGE?32:16); ::SendMessage(_hSelf, TB_SETBUTTONSIZE , 0, MAKELONG(btnSize, btnSize)); - ::SendMessage(_hSelf, TB_ADDBUTTONS, nrBtnToAdd, reinterpret_cast(_pTBB)); + ::SendMessage(_hSelf, TB_ADDBUTTONS, nbBtnToAdd, reinterpret_cast(_pTBB)); } ::SendMessage(_hSelf, TB_AUTOSIZE, 0, 0); @@ -359,7 +359,7 @@ void ToolBar::doPopop(POINT chevPoint) size_t start = 0; RECT btnRect = {0,0,0,0}; - while(start < _nrCurrentButtons) + while(start < _nbCurrentButtons) { ::SendMessage(_hSelf, TB_GETITEMRECT, start, reinterpret_cast(&btnRect)); if(btnRect.right > width) @@ -367,11 +367,11 @@ void ToolBar::doPopop(POINT chevPoint) ++start; } - if (start < _nrCurrentButtons) + if (start < _nbCurrentButtons) { //some buttons are hidden HMENU menu = ::CreatePopupMenu(); generic_string text; - while (start < _nrCurrentButtons) + while (start < _nbCurrentButtons) { int cmd = _pTBB[start].idCommand; getNameStrFromCmd(cmd, text); diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.h b/PowerEditor/src/WinControls/ToolBar/ToolBar.h index 1c228bb86..fd8f91fe5 100644 --- a/PowerEditor/src/WinControls/ToolBar/ToolBar.h +++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.h @@ -121,10 +121,10 @@ private : ToolBarIcons _toolBarIcons; toolBarStatusType _state = TB_SMALL; std::vector _vDynBtnReg; - size_t _nrButtons = 0; - size_t _nrDynButtons = 0; - size_t _nrTotalButtons = 0; - size_t _nrCurrentButtons = 0; + size_t _nbButtons = 0; + size_t _nbDynButtons = 0; + size_t _nbTotalButtons = 0; + size_t _nbCurrentButtons = 0; ReBar * _pRebar = nullptr; REBARBANDINFO _rbBand; std::vector _customIconVect; diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.cpp b/PowerEditor/src/WinControls/shortcut/shortcut.cpp index 8cbde0655..99a32ed99 100644 --- a/PowerEditor/src/WinControls/shortcut/shortcut.cpp +++ b/PowerEditor/src/WinControls/shortcut/shortcut.cpp @@ -145,30 +145,7 @@ KeyIDNAME namedKeyArray[] = { {TEXT("<>"), VK_OEM_102}, }; -#define nrKeys sizeof(namedKeyArray)/sizeof(KeyIDNAME) - -/* -TCHAR vKeyArray[][KEY_STR_LEN] = \ -{TEXT(""), TEXT("BACKSPACE"), TEXT("TAB"), TEXT("ENTER"), TEXT("PAUSE"), TEXT("CAPS LOCK"), TEXT("ESC"), TEXT("SPACEBAR"), TEXT("PAGE UP"), TEXT("PAGE DOWN"),\ -"END", TEXT("HOME"), TEXT("LEFT ARROW"), TEXT("UP ARROW"), TEXT("RIGHT ARROW"), TEXT("DOWN ARROW"), TEXT("INS"), TEXT("DEL"),\ -"0", TEXT("1"), TEXT("2"), TEXT("3"), TEXT("4"), TEXT("5"), TEXT("6"), TEXT("7"), TEXT("8"), TEXT("9"),\ -"A", TEXT("B"), TEXT("C"), TEXT("D"), TEXT("E"), TEXT("F"), TEXT("G"), TEXT("H"), TEXT("I"), TEXT("J"), TEXT("K"), TEXT("L"), TEXT("M"),\ -"N", TEXT("O"), TEXT("P"), TEXT("Q"), TEXT("R"), TEXT("S"), TEXT("T"), TEXT("U"), TEXT("V"), TEXT("W"), TEXT("X"), TEXT("Y"), TEXT("Z"),\ -"NUMPAD0", TEXT("NUMPAD1"), TEXT("NUMPAD2"), TEXT("NUMPAD3"), TEXT("NUMPAD4"),\ -"NUMPAD5", TEXT("NUMPAD6"), TEXT("NUMPAD7"), TEXT("NUMPAD8"), TEXT("NUMPAD9"),\ -"F1", TEXT("F2"), TEXT("F3"), TEXT("F4"), TEXT("F5"), TEXT("F6"),\ -"F7", TEXT("F8"), TEXT("F9"), TEXT("F10"), TEXT("F11"), TEXT("F12")}; - -UCHAR vkeyValue[] = {\ -0x00, 0x08, 0x09, 0x0D, 0x13, 0x14, 0x1B, 0x20, 0x21, 0x22,\ -0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x2D, 0x2E, 0x30, 0x31,\ -0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42,\ -0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C,\ -0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56,\ -0x57, 0x58, 0x59, 0x5A, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65,\ -0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,\ -0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B}; -*/ +#define nbKeys sizeof(namedKeyArray)/sizeof(KeyIDNAME) generic_string Shortcut::toString() const { @@ -287,7 +264,7 @@ void getKeyStrFromVal(UCHAR keyVal, generic_string & str) str = TEXT(""); bool found = false; int i; - for (i = 0; i < nrKeys; ++i) { + for (i = 0; i < nbKeys; ++i) { if (keyVal == namedKeyArray[i].id) { found = true; break; @@ -395,7 +372,7 @@ INT_PTR CALLBACK Shortcut::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) ::SendDlgItemMessage(_hSelf, IDC_SHIFT_CHECK, BM_SETCHECK, _keyCombo._isShift?BST_CHECKED:BST_UNCHECKED, 0); ::EnableWindow(::GetDlgItem(_hSelf, IDOK), isValid() && (textlen > 0 || !_canModifyName)); int iFound = -1; - for (size_t i = 0 ; i < nrKeys ; ++i) + for (size_t i = 0 ; i < nbKeys ; ++i) { ::SendDlgItemMessage(_hSelf, IDC_KEY_COMBO, CB_ADDSTRING, 0, reinterpret_cast(namedKeyArray[i].name)); @@ -822,7 +799,7 @@ void ScintillaKeyMap::showCurrentSettings() { ::SendDlgItemMessage(_hSelf, IDC_CTRL_CHECK, BM_SETCHECK, _keyCombo._isCtrl?BST_CHECKED:BST_UNCHECKED, 0); ::SendDlgItemMessage(_hSelf, IDC_ALT_CHECK, BM_SETCHECK, _keyCombo._isAlt?BST_CHECKED:BST_UNCHECKED, 0); ::SendDlgItemMessage(_hSelf, IDC_SHIFT_CHECK, BM_SETCHECK, _keyCombo._isShift?BST_CHECKED:BST_UNCHECKED, 0); - for (size_t i = 0 ; i < nrKeys ; ++i) + for (size_t i = 0 ; i < nbKeys ; ++i) { if (_keyCombo._key == namedKeyArray[i].id) { @@ -847,7 +824,7 @@ INT_PTR CALLBACK ScintillaKeyMap::run_dlgProc(UINT Message, WPARAM wParam, LPARA ::SetDlgItemText(_hSelf, IDC_NAME_EDIT, _name); _keyCombo = _keyCombos[0]; - for (size_t i = 0 ; i < nrKeys ; ++i) + for (size_t i = 0 ; i < nbKeys ; ++i) { ::SendDlgItemMessage(_hSelf, IDC_KEY_COMBO, CB_ADDSTRING, 0, reinterpret_cast(namedKeyArray[i].name)); } diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index fc5e5fe28..aa6532cc8 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -186,9 +186,9 @@ void parseCommandLine(const TCHAR* commandLine, ParamVector& paramVector) bool isInList(const TCHAR *token2Find, ParamVector & params) { - size_t nrItems = params.size(); + size_t nbItems = params.size(); - for (size_t i = 0; i < nrItems; ++i) + for (size_t i = 0; i < nbItems; ++i) { if (!lstrcmp(token2Find, params.at(i))) { @@ -202,9 +202,9 @@ bool isInList(const TCHAR *token2Find, ParamVector & params) bool getParamVal(TCHAR c, ParamVector & params, generic_string & value) { value = TEXT(""); - size_t nrItems = params.size(); + size_t nbItems = params.size(); - for (size_t i = 0; i < nrItems; ++i) + for (size_t i = 0; i < nbItems; ++i) { const TCHAR * token = params.at(i); if (token[0] == '-' && lstrlen(token) >= 2 && token[1] == c) { //dash, and enough chars @@ -219,9 +219,9 @@ bool getParamVal(TCHAR c, ParamVector & params, generic_string & value) bool getParamValFromString(const TCHAR *str, ParamVector & params, generic_string & value) { value = TEXT(""); - size_t nrItems = params.size(); + size_t nbItems = params.size(); - for (size_t i = 0; i < nrItems; ++i) + for (size_t i = 0; i < nbItems; ++i) { const TCHAR * token = params.at(i); generic_string tokenStr = token; @@ -405,9 +405,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) generic_string quotFileName = TEXT(""); // tell the running instance the FULL path to the new files to load - size_t nrFilesToOpen = params.size(); + size_t nbFilesToOpen = params.size(); - for (size_t i = 0; i < nrFilesToOpen; ++i) + for (size_t i = 0; i < nbFilesToOpen; ++i) { const TCHAR * currentFile = params.at(i); if (currentFile[0]) @@ -434,38 +434,38 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) if (hNotepad_plus) { - // First of all, destroy static object NppParameters - pNppParameters->destroyInstance(); - MainFileManager->destroyInstance(); + // First of all, destroy static object NppParameters + pNppParameters->destroyInstance(); + MainFileManager->destroyInstance(); - int sw = 0; + int sw = 0; - if (::IsZoomed(hNotepad_plus)) - sw = SW_MAXIMIZE; - else if (::IsIconic(hNotepad_plus)) - sw = SW_RESTORE; + if (::IsZoomed(hNotepad_plus)) + sw = SW_MAXIMIZE; + else if (::IsIconic(hNotepad_plus)) + sw = SW_RESTORE; - if (sw != 0) - ::ShowWindow(hNotepad_plus, sw); + if (sw != 0) + ::ShowWindow(hNotepad_plus, sw); - ::SetForegroundWindow(hNotepad_plus); + ::SetForegroundWindow(hNotepad_plus); - if (params.size() > 0) //if there are files to open, use the WM_COPYDATA system - { - COPYDATASTRUCT paramData; - paramData.dwData = COPYDATA_PARAMS; - paramData.lpData = &cmdLineParams; - paramData.cbData = sizeof(cmdLineParams); + if (params.size() > 0) //if there are files to open, use the WM_COPYDATA system + { + COPYDATASTRUCT paramData; + paramData.dwData = COPYDATA_PARAMS; + paramData.lpData = &cmdLineParams; + paramData.cbData = sizeof(cmdLineParams); - COPYDATASTRUCT fileNamesData; - fileNamesData.dwData = COPYDATA_FILENAMES; - fileNamesData.lpData = (void *)quotFileName.c_str(); - fileNamesData.cbData = long(quotFileName.length() + 1)*(sizeof(TCHAR)); + COPYDATASTRUCT fileNamesData; + fileNamesData.dwData = COPYDATA_FILENAMES; + fileNamesData.lpData = (void *)quotFileName.c_str(); + fileNamesData.cbData = long(quotFileName.length() + 1)*(sizeof(TCHAR)); - ::SendMessage(hNotepad_plus, WM_COPYDATA, reinterpret_cast(hInstance), reinterpret_cast(¶mData)); - ::SendMessage(hNotepad_plus, WM_COPYDATA, reinterpret_cast(hInstance), reinterpret_cast(&fileNamesData)); - } - return 0; + ::SendMessage(hNotepad_plus, WM_COPYDATA, reinterpret_cast(hInstance), reinterpret_cast(¶mData)); + ::SendMessage(hNotepad_plus, WM_COPYDATA, reinterpret_cast(hInstance), reinterpret_cast(&fileNamesData)); + } + return 0; } }