github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reduce compiling warning 

Close #14924
pull/14941/head
Don Ho 2024-04-01 01:14:47 +02:00
parent 6204f00e88
commit 903d47b2eb
11 changed files with 91 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
PowerEditor/src/Notepad_plus.cpp
View File

@ -404,14 +404,18 @@ LRESULT Notepad_plus::init(HWND hwnd)
TabBarPlus::setVertical((tabBarStatus & TAB_VERTICAL) != 0); TabBarPlus::setVertical((tabBarStatus & TAB_VERTICAL) != 0);
drawTabbarColoursFromStylerArray(); drawTabbarColoursFromStylerArray();
// Autocomplete list and calltip //
const Style* pStyle = NppParameters::getInstance().getGlobalStylers().findByID(STYLE_DEFAULT); // Initialize the default foreground & background color
//
const Style* pStyle = nppParam.getGlobalStylers().findByID(STYLE_DEFAULT);
if (pStyle) if (pStyle)
{ {
NppParameters::getInstance().setCurrentDefaultFgColor(pStyle->_fgColor); nppParam.setCurrentDefaultFgColor(pStyle->_fgColor);
NppParameters::getInstance().setCurrentDefaultBgColor(pStyle->_bgColor); nppParam.setCurrentDefaultBgColor(pStyle->_bgColor);
drawAutocompleteColoursFromTheme(pStyle->_fgColor, pStyle->_bgColor); drawAutocompleteColoursFromTheme(pStyle->_fgColor, pStyle->_bgColor);
} }
// Autocomplete list and calltip
AutoCompletion::drawAutocomplete(_pEditView); AutoCompletion::drawAutocomplete(_pEditView);
AutoCompletion::drawAutocomplete(_pNonEditView); AutoCompletion::drawAutocomplete(_pNonEditView);
@ -790,18 +794,6 @@ LRESULT Notepad_plus::init(HWND hwnd)
::DrawMenuBar(hwnd); ::DrawMenuBar(hwnd);
} }
//
// Initialize the default foreground & background color
//
{
const Style * pStyle = nppParam.getGlobalStylers().findByID(STYLE_DEFAULT);
if (pStyle)
{
nppParam.setCurrentDefaultFgColor(pStyle->_fgColor);
nppParam.setCurrentDefaultBgColor(pStyle->_bgColor);
}
}
// //
// launch the plugin dlg memorized at the last session // launch the plugin dlg memorized at the last session
// //
@ -948,7 +940,7 @@ bool Notepad_plus::saveGUIParams()
bool Notepad_plus::saveColumnEditorParams() bool Notepad_plus::saveColumnEditorParams()
{ {
NppParameters& nppParams = NppParameters::getInstance(); const NppParameters& nppParams = NppParameters::getInstance();
return nppParams.writeColumnEditorSettings(); return nppParams.writeColumnEditorSettings();
} }
@ -1179,7 +1171,7 @@ int Notepad_plus::getHtmlXmlEncoding(const TCHAR *fileName) const
char encodingStr[encodingStrLen]; char encodingStr[encodingStrLen];
_invisibleEditView.getText(encodingStr, startPos, endPos); _invisibleEditView.getText(encodingStr, startPos, endPos);
EncodingMapper& em = EncodingMapper::getInstance(); const EncodingMapper& em = EncodingMapper::getInstance();
int enc = em.getEncodingFromString(encodingStr); int enc = em.getEncodingFromString(encodingStr);
return (enc == CP_ACP ? -1 : enc); return (enc == CP_ACP ? -1 : enc);
} }
@ -1223,7 +1215,7 @@ int Notepad_plus::getHtmlXmlEncoding(const TCHAR *fileName) const
char encodingStr[encodingStrLen]; char encodingStr[encodingStrLen];
_invisibleEditView.getText(encodingStr, startPos, endPos); _invisibleEditView.getText(encodingStr, startPos, endPos);
EncodingMapper& em = EncodingMapper::getInstance(); const EncodingMapper& em = EncodingMapper::getInstance();
int enc = em.getEncodingFromString(encodingStr); int enc = em.getEncodingFromString(encodingStr);
return (enc == CP_ACP ? -1 : enc); return (enc == CP_ACP ? -1 : enc);
} }
@ -2224,7 +2216,7 @@ bool Notepad_plus::findInFilelist(std::vector<generic_string> & fileNames)
if (nbTotal > 0) if (nbTotal > 0)
{ {
NppParameters& nppParam = NppParameters::getInstance(); NppParameters& nppParam = NppParameters::getInstance();
NppGUI& nppGui = nppParam.getNppGUI(); const NppGUI& nppGui = nppParam.getNppGUI();
if (!nppGui._findDlgAlwaysVisible) if (!nppGui._findDlgAlwaysVisible)
{ {
_findReplaceDlg.display(false); _findReplaceDlg.display(false);
@ -2323,7 +2315,7 @@ bool Notepad_plus::findInOpenedFiles()
if (nbTotal > 0) if (nbTotal > 0)
{ {
NppParameters& nppParam = NppParameters::getInstance(); NppParameters& nppParam = NppParameters::getInstance();
NppGUI& nppGui = nppParam.getNppGUI(); const NppGUI& nppGui = nppParam.getNppGUI();
if (!nppGui._findDlgAlwaysVisible) if (!nppGui._findDlgAlwaysVisible)
{ {
_findReplaceDlg.display(false); _findReplaceDlg.display(false);
@ -2396,7 +2388,7 @@ bool Notepad_plus::findInCurrentFile(bool isEntireDoc)
if (nbTotal > 0) if (nbTotal > 0)
{ {
NppParameters& nppParam = NppParameters::getInstance(); NppParameters& nppParam = NppParameters::getInstance();
NppGUI& nppGui = nppParam.getNppGUI(); const NppGUI& nppGui = nppParam.getNppGUI();
if (!nppGui._findDlgAlwaysVisible) if (!nppGui._findDlgAlwaysVisible)
{ {
_findReplaceDlg.display(false); _findReplaceDlg.display(false);
@ -3055,7 +3047,7 @@ void Notepad_plus::setUniModeText()
} }
else else
{ {
EncodingMapper& em = EncodingMapper::getInstance(); const EncodingMapper& em = EncodingMapper::getInstance();
int cmdID = em.getIndexFromEncoding(encoding); int cmdID = em.getIndexFromEncoding(encoding);
if (cmdID == -1) if (cmdID == -1)
{ {
@ -4077,7 +4069,7 @@ size_t Notepad_plus::getSelectedCharNumber(UniMode u)
#ifdef _OPENMP #ifdef _OPENMP
#include <omp.h> #include <omp.h>
#endif #endif
static inline size_t countUtf8Characters(unsigned char *buf, size_t pos, size_t endpos) static inline size_t countUtf8Characters(const unsigned char *buf, size_t pos, size_t endpos)
{ {
size_t result = 0; size_t result = 0;
while (pos < endpos) while (pos < endpos)
@ -4581,7 +4573,7 @@ bool Notepad_plus::removeBufferFromView(BufferID id, int whichOne)
size_t i, n = taskListInfo._tlfsLst.size(); size_t i, n = taskListInfo._tlfsLst.size();
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
TaskLstFnStatus& tfs = taskListInfo._tlfsLst[i]; const TaskLstFnStatus& tfs = taskListInfo._tlfsLst[i];
if (tfs._iView != whichOne || tfs._bufID == id) if (tfs._iView != whichOne || tfs._bufID == id)
continue; continue;
toActivate = tfs._docIndex >= active ? tfs._docIndex - 1 : tfs._docIndex; toActivate = tfs._docIndex >= active ? tfs._docIndex - 1 : tfs._docIndex;
@ -4835,7 +4827,7 @@ void Notepad_plus::docGotoAnotherEditView(FileTransferMode mode)
bool Notepad_plus::activateBuffer(BufferID id, int whichOne, bool forceApplyHilite) bool Notepad_plus::activateBuffer(BufferID id, int whichOne, bool forceApplyHilite)
{ {
NppGUI& nppGui = NppParameters::getInstance().getNppGUI(); const NppGUI& nppGui = NppParameters::getInstance().getNppGUI();
bool isSnapshotMode = nppGui.isSnapshotMode(); bool isSnapshotMode = nppGui.isSnapshotMode();
if (isSnapshotMode) if (isSnapshotMode)
{ {
@ -5014,7 +5006,7 @@ void Notepad_plus::checkUnicodeMenuItems() const
} }
else else
{ {
EncodingMapper& em = EncodingMapper::getInstance(); const EncodingMapper& em = EncodingMapper::getInstance();
int cmdID = em.getIndexFromEncoding(encoding); int cmdID = em.getIndexFromEncoding(encoding);
if (cmdID == -1) if (cmdID == -1)
{ {
@ -5130,7 +5122,7 @@ bool Notepad_plus::doBlockComment(comment_mode currCommentMode)
if (buf->getLangType() == L_USER) if (buf->getLangType() == L_USER)
{ {
UserLangContainer * userLangContainer = NppParameters::getInstance().getULCFromName(buf->getUserDefineLangName()); const UserLangContainer* userLangContainer = NppParameters::getInstance().getULCFromName(buf->getUserDefineLangName());
if (!userLangContainer) if (!userLangContainer)
return false; return false;
@ -5428,7 +5420,7 @@ bool Notepad_plus::doStreamComment()
if (buf->getLangType() == L_USER) if (buf->getLangType() == L_USER)
{ {
UserLangContainer * userLangContainer = NppParameters::getInstance().getULCFromName(buf->getUserDefineLangName()); const UserLangContainer* userLangContainer = NppParameters::getInstance().getULCFromName(buf->getUserDefineLangName());
if (!userLangContainer) if (!userLangContainer)
return false; return false;
@ -5857,7 +5849,7 @@ void Notepad_plus::postItToggle()
{ {
if (!_beforeSpecialView._isPostIt) // PostIt disabled, enable it if (!_beforeSpecialView._isPostIt) // PostIt disabled, enable it
{ {
NppGUI & nppGUI = NppParameters::getInstance().getNppGUI(); const NppGUI & nppGUI = NppParameters::getInstance().getNppGUI();
// get current status before switch to postIt // get current status before switch to postIt
//check these always //check these always
{ {
@ -6019,7 +6011,7 @@ void Notepad_plus::distractionFreeToggle()
} }
// check if any dockable panel is visible // check if any dockable panel is visible
std::vector<DockingCont*> & container = _dockingManager.getContainerInfo(); const std::vector<DockingCont*>& container = _dockingManager.getContainerInfo();
_beforeSpecialView._pVisibleDockingContainers.clear(); _beforeSpecialView._pVisibleDockingContainers.clear();
for (auto i : container) for (auto i : container)
{ {
@ -6117,7 +6109,7 @@ void Notepad_plus::doSynScorll(HWND whichView)
bool Notepad_plus::getIntegralDockingData(tTbData & dockData, int & iCont, bool & isVisible) bool Notepad_plus::getIntegralDockingData(tTbData & dockData, int & iCont, bool & isVisible)
{ {
DockingManagerData & dockingData = (DockingManagerData &)(NppParameters::getInstance()).getNppGUI()._dockingData; const DockingManagerData & dockingData = (DockingManagerData &)(NppParameters::getInstance()).getNppGUI()._dockingData;
for (size_t i = 0, len = dockingData._pluginDockInfo.size(); i < len ; ++i) for (size_t i = 0, len = dockingData._pluginDockInfo.size(); i < len ; ++i)
{ {
@ -6183,11 +6175,11 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session, bool includUntitledD
NppParameters& nppParam = NppParameters::getInstance(); NppParameters& nppParam = NppParameters::getInstance();
const NppGUI& nppGUI = nppParam.getNppGUI(); const NppGUI& nppGUI = nppParam.getNppGUI();
for (size_t k = 0; k < nppGUI._excludedLangList.size(); ++k) // try to find it in exclude lang list for (size_t j = 0; j < nppGUI._excludedLangList.size(); ++j) // try to find it in exclude lang list
{ {
if (buf->getLangType() == nppGUI._excludedLangList[k]._langType) if (buf->getLangType() == nppGUI._excludedLangList[j]._langType)
{ {
languageName = nppGUI._excludedLangList[k]._langName; languageName = nppGUI._excludedLangList[j]._langName;
break; break;
} }
} }
@ -6630,7 +6622,7 @@ void Notepad_plus::notifyBufferActivated(BufferID bufid, int view)
_pFuncList->reload(); _pFuncList->reload();
} }
NppGUI& nppGui = NppParameters::getInstance().getNppGUI(); const NppGUI& nppGui = NppParameters::getInstance().getNppGUI();
bool isCurrBuffDetection = (nppGui._fileAutoDetection & cdEnabledNew) ? true : false; bool isCurrBuffDetection = (nppGui._fileAutoDetection & cdEnabledNew) ? true : false;
bool reload = buf->getNeedReload(); bool reload = buf->getNeedReload();
if (!reload && isCurrBuffDetection) if (!reload && isCurrBuffDetection)
@ -7884,11 +7876,11 @@ int Notepad_plus::getRandomAction(int ranNum)
} }
bool isInList(int elem, vector<int> elemList) bool isInList(int elem, const vector<int>& elemList)
{ {
for (size_t i = 0, len = elemList.size(); i < len; ++i) for (auto i : elemList)
{ {
if (elem == elemList[i]) if (elem == i)
return true; return true;
} }
return false; return false;
@ -8367,7 +8359,7 @@ void Notepad_plus::refreshDarkMode(bool resetStyle)
{ {
//use _stylerPath; //use _stylerPath;
pair<generic_string, generic_string>& themeInfo = themeSwitcher.getElementFromIndex(0); const pair<generic_string, generic_string>& themeInfo = themeSwitcher.getElementFromIndex(0);
themePath = themeInfo.second; themePath = themeInfo.second;
themeName = themeSwitcher.getDefaultThemeLabel(); themeName = themeSwitcher.getDefaultThemeLabel();
} }
@ -8488,7 +8480,7 @@ bool Notepad_plus::undoStreamComment(bool tryBlockComment)
return false; return false;
if (buf->getLangType() == L_USER) if (buf->getLangType() == L_USER)
{ {
UserLangContainer* userLangContainer = NppParameters::getInstance().getULCFromName(buf->getUserDefineLangName()); const UserLangContainer* userLangContainer = NppParameters::getInstance().getULCFromName(buf->getUserDefineLangName());
if (!userLangContainer) if (!userLangContainer)
return false; return false;

2
PowerEditor/src/Notepad_plus_Window.cpp
View File

@ -280,7 +280,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
} }
else else
{ {
auto& themeInfo = themeSwitcher.getElementFromIndex(0); const auto& themeInfo = themeSwitcher.getElementFromIndex(0);
themePath = themeInfo.second; themePath = themeInfo.second;
} }

4
PowerEditor/src/NppBigSwitch.cpp
View File

@ -310,8 +310,6 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
NppDarkMode::handleSettingChange(hwnd, lParam); NppDarkMode::handleSettingChange(hwnd, lParam);
const bool enableDarkMode = NppDarkMode::isExperimentalActive(); const bool enableDarkMode = NppDarkMode::isExperimentalActive();
NppParameters& nppParam = NppParameters::getInstance();
NppGUI& nppGUI = nppParam.getNppGUI(); NppGUI& nppGUI = nppParam.getNppGUI();
// Windows mode is enabled // Windows mode is enabled
@ -2005,7 +2003,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
case WM_NOTIFY: case WM_NOTIFY:
{ {
NMHDR* nmhdr = reinterpret_cast<NMHDR*>(lParam); const NMHDR* nmhdr = reinterpret_cast<NMHDR*>(lParam);
if (nmhdr->code == NM_CUSTOMDRAW && (nmhdr->hwndFrom == _toolBar.getHSelf())) if (nmhdr->code == NM_CUSTOMDRAW && (nmhdr->hwndFrom == _toolBar.getHSelf()))
{ {
NMTBCUSTOMDRAW* nmtbcd = reinterpret_cast<NMTBCUSTOMDRAW*>(lParam); NMTBCUSTOMDRAW* nmtbcd = reinterpret_cast<NMTBCUSTOMDRAW*>(lParam);

2
PowerEditor/src/NppCommands.cpp
View File

@ -1683,7 +1683,7 @@ void Notepad_plus::command(int id)
} }
break; break;
case IDM_EDIT_COLUMNMODETIP : case IDM_EDIT_COLUMNMODETIP :
{ {
_nativeLangSpeaker.messageBox("ColumnModeTip", _nativeLangSpeaker.messageBox("ColumnModeTip",
_pPublicInterface->getHSelf(), _pPublicInterface->getHSelf(),

10
PowerEditor/src/NppIO.cpp
View File

@ -263,12 +263,12 @@ BufferID Notepad_plus::doOpen(const generic_string& fileName, bool isRecursive,
// Search case 1 & 2 firstly // Search case 1 & 2 firstly
BufferID foundBufID = MainFileManager.getBufferFromName(targetFileName.c_str()); BufferID foundBufID = MainFileManager.getBufferFromName(targetFileName.c_str());
if (foundBufID == BUFFER_INVALID)
fileName2Find = longFileName;
// if case 1 & 2 not found, search case 3 // if case 1 & 2 not found, search case 3
if (foundBufID == BUFFER_INVALID) if (foundBufID == BUFFER_INVALID)
{
fileName2Find = longFileName;
foundBufID = MainFileManager.getBufferFromName(fileName2Find.c_str()); foundBufID = MainFileManager.getBufferFromName(fileName2Find.c_str());
}
// If we found the document, then we don't open the existing doc. We return the found buffer ID instead. // If we found the document, then we don't open the existing doc. We return the found buffer ID instead.
if (foundBufID != BUFFER_INVALID && !isSnapshotMode) if (foundBufID != BUFFER_INVALID && !isSnapshotMode)
@ -656,7 +656,7 @@ bool Notepad_plus::doSave(BufferID id, const TCHAR * filename, bool isCopy)
else else
{ {
// try to open Notepad++ in admin mode // try to open Notepad++ in admin mode
NppGUI& nppGui = NppParameters::getInstance().getNppGUI(); const NppGUI& nppGui = NppParameters::getInstance().getNppGUI();
bool isSnapshotMode = nppGui.isSnapshotMode(); bool isSnapshotMode = nppGui.isSnapshotMode();
bool isAlwaysInMultiInstMode = nppGui._multiInstSetting == multiInst; bool isAlwaysInMultiInstMode = nppGui._multiInstSetting == multiInst;
if (isSnapshotMode && !isAlwaysInMultiInstMode) // if both rememberSession && backup mode are enabled and "Always In Multi-Instance Mode" option not activated: if (isSnapshotMode && !isAlwaysInMultiInstMode) // if both rememberSession && backup mode are enabled and "Always In Multi-Instance Mode" option not activated:
@ -1625,7 +1625,7 @@ bool Notepad_plus::fileSave(BufferID id)
constexpr int temBufLen = 32; constexpr int temBufLen = 32;
TCHAR tmpbuf[temBufLen]{}; TCHAR tmpbuf[temBufLen]{};
time_t ltime = time(0); time_t ltime = time(0);
struct tm *today; const struct tm* today;
today = localtime(&ltime); today = localtime(&ltime);
if (today) if (today)

18
PowerEditor/src/NppNotification.cpp
View File

@ -151,8 +151,8 @@ BOOL Notepad_plus::notify(SCNotification *notification)
BufferID id = pTabDocView->getBufferByIndex(tbHdr->_tabOrigin); BufferID id = pTabDocView->getBufferByIndex(tbHdr->_tabOrigin);
Buffer *pBuf = MainFileManager.getBufferByID(id); Buffer *pBuf = MainFileManager.getBufferByID(id);
Buffer *currentBufMain = _mainEditView.getCurrentBuffer(); const Buffer* currentBufMain = _mainEditView.getCurrentBuffer();
Buffer *currentBufSub = _subEditView.getCurrentBuffer(); const Buffer* currentBufSub = _subEditView.getCurrentBuffer();
RECT rect{}; RECT rect{};
TabCtrl_GetItemRect(pTabDocView->getHSelf(), tbHdr->_tabOrigin, &rect); TabCtrl_GetItemRect(pTabDocView->getHSelf(), tbHdr->_tabOrigin, &rect);
@ -179,10 +179,10 @@ BOOL Notepad_plus::notify(SCNotification *notification)
if (pTabDocView) if (pTabDocView)
{ {
BufferID id = pTabDocView->getBufferByIndex(tbHdr->_tabOrigin); BufferID id = pTabDocView->getBufferByIndex(tbHdr->_tabOrigin);
Buffer *pBuf = MainFileManager.getBufferByID(id); Buffer* pBuf = MainFileManager.getBufferByID(id);
Buffer *currentBufMain = _mainEditView.getCurrentBuffer(); const Buffer* currentBufMain = _mainEditView.getCurrentBuffer();
Buffer *currentBufSub = _subEditView.getCurrentBuffer(); const Buffer* currentBufSub = _subEditView.getCurrentBuffer();
if (pBuf != currentBufMain && pBuf != currentBufSub) // if hover on other tab if (pBuf != currentBufMain && pBuf != currentBufSub) // if hover on other tab
{ {
@ -478,10 +478,10 @@ BOOL Notepad_plus::notify(SCNotification *notification)
} }
else if (lpnm->dwItemSpec == DWORD(STATUSBAR_UNICODE_TYPE)) else if (lpnm->dwItemSpec == DWORD(STATUSBAR_UNICODE_TYPE))
{ {
POINT p; POINT cursorPos;
::GetCursorPos(&p); ::GetCursorPos(&cursorPos);
HMENU hLangMenu = ::GetSubMenu(_mainMenuHandle, MENUINDEX_FORMAT); HMENU hLangMenu = ::GetSubMenu(_mainMenuHandle, MENUINDEX_FORMAT);
TrackPopupMenu(hLangMenu, 0, p.x, p.y, 0, _pPublicInterface->getHSelf(), NULL); TrackPopupMenu(hLangMenu, 0, cursorPos.x, cursorPos.y, 0, _pPublicInterface->getHSelf(), NULL);
} }
return TRUE; return TRUE;
} }
@ -1072,7 +1072,7 @@ BOOL Notepad_plus::notify(SCNotification *notification)
if (_syncInfo.doSync()) if (_syncInfo.doSync())
doSynScorll(HWND(notification->nmhdr.hwndFrom)); doSynScorll(HWND(notification->nmhdr.hwndFrom));
NppParameters& nppParam = NppParameters::getInstance(); const NppParameters& nppParam = NppParameters::getInstance();
// if it's searching/replacing, then do nothing // if it's searching/replacing, then do nothing
if ((_linkTriggered && !nppParam._isFindReplacing) || notification->wParam == LINKTRIGGERED) if ((_linkTriggered && !nppParam._isFindReplacing) || notification->wParam == LINKTRIGGERED)

26
PowerEditor/src/Parameters.cpp
View File

@ -713,7 +713,7 @@ std::wstring LocalizationSwitcher::getXmlFilePathFromLangName(const wchar_t *lan
bool LocalizationSwitcher::addLanguageFromXml(const std::wstring& xmlFullPath) bool LocalizationSwitcher::addLanguageFromXml(const std::wstring& xmlFullPath)
{ {
wchar_t * fn = ::PathFindFileNameW(xmlFullPath.c_str()); const wchar_t * fn = ::PathFindFileNameW(xmlFullPath.c_str());
wstring foundLang = getLangFromXmlFileName(fn); wstring foundLang = getLangFromXmlFileName(fn);
if (!foundLang.empty()) if (!foundLang.empty())
{ {
@ -1705,7 +1705,7 @@ void NppParameters::destroyInstance()
delete _pXmlUserStylerDoc; delete _pXmlUserStylerDoc;
//delete _pXmlUserLangDoc; will be deleted in the vector //delete _pXmlUserLangDoc; will be deleted in the vector
for (auto& l : _pXmlUserLangsDoc) for (const auto& l : _pXmlUserLangsDoc)
{ {
delete l._udlXmlDoc; delete l._udlXmlDoc;
} }
@ -2244,6 +2244,7 @@ int NppParameters::getPluginCmdIdFromMenuEntryItemName(HMENU pluginsMenu, const
bool NppParameters::getContextMenuFromXmlTree(HMENU mainMenuHadle, HMENU pluginsMenu, bool isEditCM) bool NppParameters::getContextMenuFromXmlTree(HMENU mainMenuHadle, HMENU pluginsMenu, bool isEditCM)
{ {
std::vector<MenuItemUnit>& contextMenuItems = isEditCM ? _contextMenuItems : _tabContextMenuItems; std::vector<MenuItemUnit>& contextMenuItems = isEditCM ? _contextMenuItems : _tabContextMenuItems;
TiXmlDocumentA* pXmlContextMenuDocA = isEditCM ? _pXmlContextMenuDocA : _pXmlTabContextMenuDocA; TiXmlDocumentA* pXmlContextMenuDocA = isEditCM ? _pXmlContextMenuDocA : _pXmlTabContextMenuDocA;
std::string cmName = isEditCM ? "ScintillaContextMenu" : "TabContextMenu"; std::string cmName = isEditCM ? "ScintillaContextMenu" : "TabContextMenu";
@ -3748,10 +3749,10 @@ void NppParameters::writeSession(const Session & session, const TCHAR *fileName)
// Node structure and naming corresponds to config.xml // Node structure and naming corresponds to config.xml
TiXmlNode* fileBrowserRootNode = sessionNode->InsertEndChild(TiXmlElement(TEXT("FileBrowser"))); TiXmlNode* fileBrowserRootNode = sessionNode->InsertEndChild(TiXmlElement(TEXT("FileBrowser")));
fileBrowserRootNode->ToElement()->SetAttribute(TEXT("latestSelectedItem"), session._fileBrowserSelectedItem.c_str()); fileBrowserRootNode->ToElement()->SetAttribute(TEXT("latestSelectedItem"), session._fileBrowserSelectedItem.c_str());
for (const auto& root : session._fileBrowserRoots) for (const auto& fbRoot : session._fileBrowserRoots)
{ {
TiXmlNode *fileNameNode = fileBrowserRootNode->InsertEndChild(TiXmlElement(TEXT("root"))); TiXmlNode *fileNameNode = fileBrowserRootNode->InsertEndChild(TiXmlElement(TEXT("root")));
(fileNameNode->ToElement())->SetAttribute(TEXT("foldername"), root.c_str()); (fileNameNode->ToElement())->SetAttribute(TEXT("foldername"), fbRoot.c_str());
} }
} }
} }
@ -4002,7 +4003,6 @@ void NppParameters::feedUserSettings(TiXmlNode *settingsRoot)
void NppParameters::feedUserKeywordList(TiXmlNode *node) void NppParameters::feedUserKeywordList(TiXmlNode *node)
{ {
const TCHAR * udlVersion = _userLangArray[_nbUserLang - 1]->_udlVersion.c_str(); const TCHAR * udlVersion = _userLangArray[_nbUserLang - 1]->_udlVersion.c_str();
int id = -1;
for (TiXmlNode *childNode = node->FirstChildElement(TEXT("Keywords")); for (TiXmlNode *childNode = node->FirstChildElement(TEXT("Keywords"));
childNode ; childNode ;
@ -4016,7 +4016,7 @@ void NppParameters::feedUserKeywordList(TiXmlNode *node)
if (!lstrcmp(udlVersion, TEXT("")) && !lstrcmp(keywordsName, TEXT("Delimiters"))) // support for old style (pre 2.0) if (!lstrcmp(udlVersion, TEXT("")) && !lstrcmp(keywordsName, TEXT("Delimiters"))) // support for old style (pre 2.0)
{ {
basic_string<TCHAR> temp; basic_string<TCHAR> temp;
kwl = (valueNode)?valueNode->Value():TEXT("000000"); kwl = valueNode->Value();
temp += TEXT("00"); if (kwl[0] != '0') temp += kwl[0]; temp += TEXT(" 01"); temp += TEXT("00"); if (kwl[0] != '0') temp += kwl[0]; temp += TEXT(" 01");
temp += TEXT(" 02"); if (kwl[3] != '0') temp += kwl[3]; temp += TEXT(" 02"); if (kwl[3] != '0') temp += kwl[3];
@ -4030,7 +4030,7 @@ void NppParameters::feedUserKeywordList(TiXmlNode *node)
} }
else if (!lstrcmp(keywordsName, TEXT("Comment"))) else if (!lstrcmp(keywordsName, TEXT("Comment")))
{ {
kwl = (valueNode)?valueNode->Value():TEXT(""); kwl = valueNode->Value();
basic_string<TCHAR> temp{TEXT(" ")}; basic_string<TCHAR> temp{TEXT(" ")};
temp += kwl; temp += kwl;
@ -4063,10 +4063,10 @@ void NppParameters::feedUserKeywordList(TiXmlNode *node)
} }
else else
{ {
kwl = (valueNode)?valueNode->Value():TEXT(""); kwl = valueNode->Value();
if (globalMappper().keywordIdMapper.find(keywordsName) != globalMappper().keywordIdMapper.end()) if (globalMappper().keywordIdMapper.find(keywordsName) != globalMappper().keywordIdMapper.end())
{ {
id = globalMappper().keywordIdMapper[keywordsName]; int id = globalMappper().keywordIdMapper[keywordsName];
if (wcslen(kwl) < max_char) if (wcslen(kwl) < max_char)
{ {
wcscpy_s(_userLangArray[_nbUserLang - 1]->_keywordLists[id], kwl); wcscpy_s(_userLangArray[_nbUserLang - 1]->_keywordLists[id], kwl);
@ -4083,8 +4083,6 @@ void NppParameters::feedUserKeywordList(TiXmlNode *node)
void NppParameters::feedUserStyles(TiXmlNode *node) void NppParameters::feedUserStyles(TiXmlNode *node)
{ {
int id = -1;
for (TiXmlNode *childNode = node->FirstChildElement(TEXT("WordsStyle")); for (TiXmlNode *childNode = node->FirstChildElement(TEXT("WordsStyle"));
childNode ; childNode ;
childNode = childNode->NextSibling(TEXT("WordsStyle"))) childNode = childNode->NextSibling(TEXT("WordsStyle")))
@ -4094,7 +4092,7 @@ void NppParameters::feedUserStyles(TiXmlNode *node)
{ {
if (globalMappper().styleIdMapper.find(styleName) != globalMappper().styleIdMapper.end()) if (globalMappper().styleIdMapper.find(styleName) != globalMappper().styleIdMapper.end())
{ {
id = globalMappper().styleIdMapper[styleName]; int id = globalMappper().styleIdMapper[styleName];
_userLangArray[_nbUserLang - 1]->_styles.addStyler((id | L_USER << 16), childNode); _userLangArray[_nbUserLang - 1]->_styles.addStyler((id | L_USER << 16), childNode);
} }
} }
@ -8665,7 +8663,7 @@ Date::Date(int nbDaysFromNow)
const time_t oneDay = (60 * 60 * 24); const time_t oneDay = (60 * 60 * 24);
time_t rawtime; time_t rawtime;
tm* timeinfo; const tm* timeinfo;
time(&rawtime); time(&rawtime);
rawtime += (nbDaysFromNow * oneDay); rawtime += (nbDaysFromNow * oneDay);
@ -8682,7 +8680,7 @@ Date::Date(int nbDaysFromNow)
void Date::now() void Date::now()
{ {
time_t rawtime; time_t rawtime;
tm* timeinfo; const tm* timeinfo;
time(&rawtime); time(&rawtime);
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);

14
PowerEditor/src/Parameters.h
View File

@ -210,7 +210,7 @@ struct sessionFileInfo : public Position
if (backupFilePath) _backupFilePath = backupFilePath; if (backupFilePath) _backupFilePath = backupFilePath;
} }
sessionFileInfo(std::wstring fn) : _fileName(fn) {} sessionFileInfo(const std::wstring& fn) : _fileName(fn) {}
std::wstring _fileName; std::wstring _fileName;
std::wstring _langName; std::wstring _langName;
@ -533,7 +533,7 @@ private :
}; };
struct SortLexersInAlphabeticalOrder { struct SortLexersInAlphabeticalOrder {
bool operator() (LexerStyler& l, LexerStyler& r) { bool operator() (const LexerStyler& l, const LexerStyler& r) {
if (!lstrcmp(l.getLexerDesc(), TEXT("Search result"))) if (!lstrcmp(l.getLexerDesc(), TEXT("Search result")))
return false; return false;
if (!lstrcmp(r.getLexerDesc(), TEXT("Search result"))) if (!lstrcmp(r.getLexerDesc(), TEXT("Search result")))
@ -1337,7 +1337,7 @@ public:
return _themeList[index]; return _themeList[index];
} }
void setThemeDirPath(std::wstring themeDirPath) { _themeDirPath = themeDirPath; } void setThemeDirPath(const std::wstring& themeDirPath) { _themeDirPath = themeDirPath; }
std::wstring getThemeDirPath() const { return _themeDirPath; } std::wstring getThemeDirPath() const { return _themeDirPath; }
std::wstring getDefaultThemeLabel() const { return _defaultThemeLabel; } std::wstring getDefaultThemeLabel() const { return _defaultThemeLabel; }
@ -1354,7 +1354,7 @@ public:
} }
}; };
void addThemeStylerSavePath(std::wstring key, std::wstring val) { void addThemeStylerSavePath(const std::wstring& key, const std::wstring& val) {
_themeStylerSavePath[key] = val; _themeStylerSavePath[key] = val;
}; };
@ -1444,7 +1444,7 @@ public:
const TCHAR * getWordList(LangType langID, int typeIndex) const const TCHAR * getWordList(LangType langID, int typeIndex) const
{ {
Lang *pLang = getLangFromID(langID); const Lang* pLang = getLangFromID(langID);
if (!pLang) return nullptr; if (!pLang) return nullptr;
return pLang->getWords(typeIndex); return pLang->getWords(typeIndex);
@ -1731,9 +1731,9 @@ public:
} }
std::vector<std::wstring> & getBlackList() { return _blacklist; }; std::vector<std::wstring> & getBlackList() { return _blacklist; };
bool isInBlackList(TCHAR *fn) const bool isInBlackList(const wchar_t* fn) const
{ {
for (auto& element: _blacklist) for (const auto& element: _blacklist)
{ {
if (element == fn) if (element == fn)
return true; return true;

6
PowerEditor/src/WinControls/FunctionList/functionParser.cpp
View File

@ -281,11 +281,11 @@ bool FunctionParsersManager::getOverrideMapFromXmlTree(const generic_string & xm
} }
else if (userDefinedLangName && userDefinedLangName[0]) else if (userDefinedLangName && userDefinedLangName[0])
{ {
++_currentUDIndex;
if (_currentUDIndex < L_EXTERNAL + nbMaxUserDefined) if (_currentUDIndex < L_EXTERNAL + nbMaxUserDefined)
{ {
++_currentUDIndex; _parsers[_currentUDIndex] = new ParserInfo(id, userDefinedLangName);
_parsers[_currentUDIndex] = new ParserInfo(id, userDefinedLangName);
} }
} }
} }

18
PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.cpp
View File

@ -416,21 +416,9 @@ private:
void installHooks() void installHooks()
{ {
_prevKbdHook = ::SetWindowsHookEx(WH_KEYBOARD, _prevKbdHook = ::SetWindowsHookEx(WH_KEYBOARD, &FileDialogEventHandler::KbdProcHook, nullptr, ::GetCurrentThreadId());
reinterpret_cast<HOOKPROC>(&FileDialogEventHandler::KbdProcHook), _prevCallHook = ::SetWindowsHookEx(WH_CALLWNDPROC, &FileDialogEventHandler::CallProcHook, nullptr, ::GetCurrentThreadId());
nullptr, _langaugeDetectHook = ::SetWindowsHookEx(WH_SHELL, &FileDialogEventHandler::LanguageDetectHook, nullptr,::GetCurrentThreadId());
::GetCurrentThreadId()
);
_prevCallHook = ::SetWindowsHookEx(WH_CALLWNDPROC,
reinterpret_cast<HOOKPROC>(&FileDialogEventHandler::CallProcHook),
nullptr,
::GetCurrentThreadId()
);
_langaugeDetectHook = ::SetWindowsHookEx(WH_SHELL,
reinterpret_cast<HOOKPROC>(&FileDialogEventHandler::LanguageDetectHook),
nullptr,
::GetCurrentThreadId()
);
} }
void removeHooks() void removeHooks()

34
PowerEditor/src/localization.cpp
View File

@ -25,7 +25,7 @@ using namespace std;
MenuPosition menuPos[] = { MenuPosition g_menuFolderPositions[] = {
//============================================== //==============================================
// {L0, L1, L2, id}, // {L0, L1, L2, id},
//============================================== //==============================================
@ -110,6 +110,18 @@ MenuPosition menuPos[] = {
{ -1, -1, -1, "" } // End of array { -1, -1, -1, "" } // End of array
}; };
MenuPosition& getMenuPosition(const char* id)
{
int nbSubMenuPos = sizeof(g_menuFolderPositions) / sizeof(MenuPosition);
for (int i = 0; i < nbSubMenuPos; ++i)
{
if (strcmp(g_menuFolderPositions[i]._id, id) == 0)
return g_menuFolderPositions[i];
}
return g_menuFolderPositions[nbSubMenuPos - 1];
}
void NativeLangSpeaker::init(TiXmlDocumentA *nativeLangDocRootA, bool loadIfEnglish) void NativeLangSpeaker::init(TiXmlDocumentA *nativeLangDocRootA, bool loadIfEnglish)
{ {
if (nativeLangDocRootA) if (nativeLangDocRootA)
@ -158,7 +170,7 @@ void NativeLangSpeaker::init(TiXmlDocumentA *nativeLangDocRootA, bool loadIfEngl
if (declaration) if (declaration)
{ {
const char * encodingStr = declaration->Encoding(); const char * encodingStr = declaration->Encoding();
EncodingMapper& em = EncodingMapper::getInstance(); const EncodingMapper& em = EncodingMapper::getInstance();
int enc = em.getEncodingFromString(encodingStr); int enc = em.getEncodingFromString(encodingStr);
_nativeLangEncoding = (enc != -1)?enc:CP_ACP; _nativeLangEncoding = (enc != -1)?enc:CP_ACP;
} }
@ -336,20 +348,6 @@ generic_string NativeLangSpeaker::getLocalizedStrFromID(const char *strID, const
} }
MenuPosition & getMenuPosition(const char *id)
{
int nbSubMenuPos = sizeof(menuPos)/sizeof(MenuPosition);
for (int i = 0; i < nbSubMenuPos; ++i)
{
if (strcmp(menuPos[i]._id, id) == 0)
return menuPos[i];
}
return menuPos[nbSubMenuPos-1];
}
// Get string from map. // Get string from map.
// If string not found, get string from menu, then put it into map for the next use. // If string not found, get string from menu, then put it into map for the next use.
void NativeLangSpeaker::getMainMenuEntryName(std::wstring& dest, HMENU hMenu, const char* menuId, const wchar_t* defaultDest) void NativeLangSpeaker::getMainMenuEntryName(std::wstring& dest, HMENU hMenu, const char* menuId, const wchar_t* defaultDest)
@ -789,8 +787,8 @@ void NativeLangSpeaker::changeUserDefineLang(UserDefineDialog *userDefineDlg)
{ {
if (id == IDC_DOCK_BUTTON && userDefineDlg->isDocked()) if (id == IDC_DOCK_BUTTON && userDefineDlg->isDocked())
{ {
generic_string name = getAttrNameByIdStr(TEXT("Undock"), userDefineDlgNode, std::to_string(IDC_UNDOCK_BUTTON).c_str()); generic_string undockStr = getAttrNameByIdStr(TEXT("Undock"), userDefineDlgNode, std::to_string(IDC_UNDOCK_BUTTON).c_str());
::SetWindowText(hItem, name.c_str()); ::SetWindowText(hItem, undockStr.c_str());
} }
else else
{ {