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

Fix some gcc warnings 

Fix #14845, close #14846
This commit is contained in:
ozone10 2024-03-08 22:02:42 +01:00 committed by Don Ho
parent 4e1a3eef4a
commit 9d92b0a869
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -59,8 +59,8 @@ std::string getFileContent(const TCHAR *file2read)
char data[blockSize]; char data[blockSize];
std::string wholeFileContent = ""; std::string wholeFileContent = "";
FILE *fp = _wfopen(file2read, TEXT("rb")); FILE *fp = _wfopen(file2read, TEXT("rb"));
if (!fp) if (!fp)
return ""; return "";
size_t lenFile = 0; size_t lenFile = 0;
do do

1
PowerEditor/src/Notepad_plus.cpp
View File

@ -6430,6 +6430,7 @@ void Notepad_plus::notifyBufferChanged(Buffer * buffer, int mask)
{ {
case DOC_UNNAMED: //nothing todo case DOC_UNNAMED: //nothing todo
case DOC_REGULAR: //nothing todo case DOC_REGULAR: //nothing todo
case DOC_INACCESSIBLE: //nothing todo
{ {
break; break;
} }

6
PowerEditor/src/Parameters.cpp
View File

@ -2820,16 +2820,16 @@ void NppParameters::feedShortcut(TiXmlNodeA *node)
childNode ; childNode ;
childNode = childNode->NextSibling("Shortcut")) childNode = childNode->NextSibling("Shortcut"))
{ {
int id; int id = 0;
const char* idStr = (childNode->ToElement())->Attribute("id", &id); const char* idStr = (childNode->ToElement())->Attribute("id", &id);
if (idStr) if (idStr)
{ {
//find the commandid that matches this Shortcut sc and alter it, push back its index in the modified list, if not present //find the commandid that matches this Shortcut sc and alter it, push back its index in the modified list, if not present
size_t len = _shortcuts.size(); size_t len = _shortcuts.size();
bool isFound = false; bool isFound = false;
for (size_t i = 0; i < len, !isFound; ++i) for (size_t i = 0; i < len && !isFound; ++i)
{ {
if (_shortcuts[i].getID() == (unsigned long)id) if (_shortcuts[i].getID() == static_cast<unsigned long>(id))
{ //found our match { //found our match
isFound = getInternalCommandShortcuts(childNode, _shortcuts[i]); isFound = getInternalCommandShortcuts(childNode, _shortcuts[i]);

2
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
View File

@ -505,7 +505,7 @@ LRESULT ScintillaEditView::scintillaNew_Proc(HWND hwnd, UINT Message, WPARAM wPa
// prevent "control characters" from being entered in text // prevent "control characters" from being entered in text
// (don't need to be concerned about Tab or CR or LF etc here) // (don't need to be concerned about Tab or CR or LF etc here)
if ((NppParameters::getInstance()).getSVP()._npcNoInputC0 && if ((NppParameters::getInstance()).getSVP()._npcNoInputC0 &&
((wParam >= 0 && wParam <= 31) || wParam == 127)) (wParam <= 31 || wParam == 127))
{ {
return FALSE; return FALSE;
} }