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

Remove some ugly coding styles

This commit is contained in:
Don HO 2019-03-13 02:02:35 +01:00
parent e4f9778358
commit 5356f648c2
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
30 changed files with 88 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/MISC/Common/Common.h
View File

@ -126,7 +126,7 @@ protected:
class StringBuffer final class StringBuffer final
{ {
public: public:
~StringBuffer() { if(_allocLen) delete[] _str; } ~StringBuffer() { if (_allocLen) delete[] _str; }
void sizeTo(size_t size) void sizeTo(size_t size)
{ {

2
PowerEditor/src/Notepad_plus_Window.cpp
View File

@ -130,7 +130,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
WINDOWPLACEMENT posInfo; WINDOWPLACEMENT posInfo;
posInfo.length = sizeof(WINDOWPLACEMENT); posInfo.length = sizeof(WINDOWPLACEMENT);
posInfo.flags = 0; posInfo.flags = 0;
if(_isPrelaunch) if (_isPrelaunch)
posInfo.showCmd = SW_HIDE; posInfo.showCmd = SW_HIDE;
else else
posInfo.showCmd = nppGUI._isMaximized ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL; posInfo.showCmd = nppGUI._isMaximized ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL;

2
PowerEditor/src/NppBigSwitch.cpp
View File

@ -1855,7 +1855,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
case WM_ENDSESSION: case WM_ENDSESSION:
{ {
if(wParam == TRUE) if (wParam == TRUE)
::DestroyWindow(hwnd); ::DestroyWindow(hwnd);
return 0; return 0;
} }

10
PowerEditor/src/NppCommands.cpp
View File

@ -783,11 +783,11 @@ void Notepad_plus::command(int id)
const int index = id - IDM_VIEW_TAB1; const int index = id - IDM_VIEW_TAB1;
BufferID buf = _pDocTab->getBufferByIndex(index); BufferID buf = _pDocTab->getBufferByIndex(index);
_isFolding = true; _isFolding = true;
if(buf == BUFFER_INVALID) if (buf == BUFFER_INVALID)
{ {
// No buffer at chosen index, select the very last buffer instead. // No buffer at chosen index, select the very last buffer instead.
const int last_index = _pDocTab->getItemCount() - 1; const int last_index = _pDocTab->getItemCount() - 1;
if(last_index > 0) if (last_index > 0)
switchToFile(_pDocTab->getBufferByIndex(last_index)); switchToFile(_pDocTab->getBufferByIndex(last_index));
} }
else else
@ -803,7 +803,7 @@ void Notepad_plus::command(int id)
const int current_index = _pDocTab->getCurrentTabIndex(); const int current_index = _pDocTab->getCurrentTabIndex();
const int last_index = _pDocTab->getItemCount() - 1; const int last_index = _pDocTab->getItemCount() - 1;
_isFolding = true; _isFolding = true;
if(current_index < last_index) if (current_index < last_index)
switchToFile(_pDocTab->getBufferByIndex(current_index + 1)); switchToFile(_pDocTab->getBufferByIndex(current_index + 1));
else else
{ {
@ -817,7 +817,7 @@ void Notepad_plus::command(int id)
{ {
const int current_index = _pDocTab->getCurrentTabIndex(); const int current_index = _pDocTab->getCurrentTabIndex();
_isFolding = true; _isFolding = true;
if(current_index > 0) if (current_index > 0)
switchToFile(_pDocTab->getBufferByIndex(current_index - 1)); switchToFile(_pDocTab->getBufferByIndex(current_index - 1));
else else
{ {
@ -1280,7 +1280,7 @@ void Notepad_plus::command(int id)
if (braceOpposite != -1) if (braceOpposite != -1)
{ {
if(id == IDM_SEARCH_GOTOMATCHINGBRACE) if (id == IDM_SEARCH_GOTOMATCHINGBRACE)
_pEditView->execute(SCI_GOTOPOS, braceOpposite); _pEditView->execute(SCI_GOTOPOS, braceOpposite);
else else
_pEditView->execute(SCI_SETSEL, min(braceAtCaret, braceOpposite), max(braceAtCaret, braceOpposite) + 1); // + 1 so we always include the ending brace in the selection. _pEditView->execute(SCI_SETSEL, min(braceAtCaret, braceOpposite), max(braceAtCaret, braceOpposite) + 1); // + 1 so we always include the ending brace in the selection.

10
PowerEditor/src/NppIO.cpp
View File

@ -908,7 +908,7 @@ bool Notepad_plus::fileCloseAll(bool doDeleteBackup, bool isSnapshotMode)
{ {
// warning user and save it if user want it. // warning user and save it if user want it.
activateBuffer(id, MAIN_VIEW); activateBuffer(id, MAIN_VIEW);
if(!activateBuffer(id, SUB_VIEW)) if (!activateBuffer(id, SUB_VIEW))
switchEditViewTo(MAIN_VIEW); switchEditViewTo(MAIN_VIEW);
int res = _nativeLangSpeaker.messageBox("NoBackupDoSaveFile", int res = _nativeLangSpeaker.messageBox("NoBackupDoSaveFile",
@ -934,7 +934,7 @@ bool Notepad_plus::fileCloseAll(bool doDeleteBackup, bool isSnapshotMode)
else else
{ {
activateBuffer(id, MAIN_VIEW); activateBuffer(id, MAIN_VIEW);
if(!activateBuffer(id, SUB_VIEW)) if (!activateBuffer(id, SUB_VIEW))
switchEditViewTo(MAIN_VIEW); switchEditViewTo(MAIN_VIEW);
int res = doSaveOrNot(buf->getFullPathName()); int res = doSaveOrNot(buf->getFullPathName());
@ -1042,10 +1042,10 @@ bool Notepad_plus::fileCloseAllGiven(const std::vector<int> &krvecBufferIndexes)
} }
else if (buf->isDirty()) else if (buf->isDirty())
{ {
if(_activeView == MAIN_VIEW) if (_activeView == MAIN_VIEW)
{ {
activateBuffer(id, MAIN_VIEW); activateBuffer(id, MAIN_VIEW);
if(!activateBuffer(id, SUB_VIEW)) if (!activateBuffer(id, SUB_VIEW))
switchEditViewTo(MAIN_VIEW); switchEditViewTo(MAIN_VIEW);
} }
else else
@ -1120,7 +1120,7 @@ bool Notepad_plus::fileCloseAllButCurrent()
else if (buf->isDirty()) else if (buf->isDirty())
{ {
activateBuffer(id, MAIN_VIEW); activateBuffer(id, MAIN_VIEW);
if(!activateBuffer(id, SUB_VIEW)) if (!activateBuffer(id, SUB_VIEW))
switchEditViewTo(MAIN_VIEW); switchEditViewTo(MAIN_VIEW);
int res = doSaveOrNot(buf->getFullPathName()); int res = doSaveOrNot(buf->getFullPathName());

10
PowerEditor/src/Parameters.cpp
View File

@ -736,7 +736,7 @@ winVer NppParameters::getWindowsVersion()
} }
pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetNativeSystemInfo"); pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetNativeSystemInfo");
if(pGNSI != NULL) if (pGNSI != NULL)
pGNSI(&si); pGNSI(&si);
else else
GetSystemInfo(&si); GetSystemInfo(&si);
@ -5029,16 +5029,16 @@ void NppParameters::feedGUIParameters(TiXmlNode *node)
{ {
int leftmost = 0; int leftmost = 0;
element->Attribute(TEXT("leftmostDelimiter"), &leftmost); element->Attribute(TEXT("leftmostDelimiter"), &leftmost);
if(leftmost > 0 && leftmost < 256) if (leftmost > 0 && leftmost < 256)
_nppGUI._leftmostDelimiter = static_cast<char>(leftmost); _nppGUI._leftmostDelimiter = static_cast<char>(leftmost);
int rightmost = 0; int rightmost = 0;
element->Attribute(TEXT("rightmostDelimiter"), &rightmost); element->Attribute(TEXT("rightmostDelimiter"), &rightmost);
if(rightmost > 0 && rightmost < 256) if (rightmost > 0 && rightmost < 256)
_nppGUI._rightmostDelimiter = static_cast<char>(rightmost); _nppGUI._rightmostDelimiter = static_cast<char>(rightmost);
const TCHAR *delimiterSelectionOnEntireDocument = element->Attribute(TEXT("delimiterSelectionOnEntireDocument")); const TCHAR *delimiterSelectionOnEntireDocument = element->Attribute(TEXT("delimiterSelectionOnEntireDocument"));
if(delimiterSelectionOnEntireDocument != NULL && !lstrcmp(delimiterSelectionOnEntireDocument, TEXT("yes"))) if (delimiterSelectionOnEntireDocument != NULL && !lstrcmp(delimiterSelectionOnEntireDocument, TEXT("yes")))
_nppGUI._delimiterSelectionOnEntireDocument = true; _nppGUI._delimiterSelectionOnEntireDocument = true;
else else
_nppGUI._delimiterSelectionOnEntireDocument = false; _nppGUI._delimiterSelectionOnEntireDocument = false;
@ -6301,7 +6301,7 @@ int NppParameters::langTypeToCommandID(LangType lt) const
default : default :
if(lt >= L_EXTERNAL && lt < L_END) if (lt >= L_EXTERNAL && lt < L_END)
id = lt - L_EXTERNAL + IDM_LANG_EXTERNAL; id = lt - L_EXTERNAL + IDM_LANG_EXTERNAL;
else else
id = IDM_LANG_TEXT; id = IDM_LANG_TEXT;

34
PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
View File

@ -164,7 +164,7 @@ void AutoCompletion::getWordArray(vector<generic_string> & wordArray, TCHAR *beg
static generic_string addTrailingSlash(generic_string path) static generic_string addTrailingSlash(generic_string path)
{ {
if(path.length() >=1 && path[path.length() - 1] == '\\') if (path.length() >=1 && path[path.length() - 1] == '\\')
return path; return path;
else else
return path + L"\\"; return path + L"\\";
@ -172,7 +172,7 @@ static generic_string addTrailingSlash(generic_string path)
static generic_string removeTrailingSlash(generic_string path) static generic_string removeTrailingSlash(generic_string path)
{ {
if(path.length() >= 1 && path[path.length() - 1] == '\\') if (path.length() >= 1 && path[path.length() - 1] == '\\')
return path.substr(0, path.length() - 1); return path.substr(0, path.length() - 1);
else else
return path; return path;
@ -204,13 +204,13 @@ static bool getRawPath(generic_string input, generic_string &rawPath_out)
// a quotation mark. // a quotation mark.
locale loc; locale loc;
size_t lastOccurrence = input.rfind(L":"); size_t lastOccurrence = input.rfind(L":");
if(lastOccurrence == std::string::npos) // No match. if (lastOccurrence == std::string::npos) // No match.
return false; return false;
else if(lastOccurrence == 0) else if (lastOccurrence == 0)
return false; return false;
else if(!std::isalpha(input[lastOccurrence - 1], loc)) else if (!std::isalpha(input[lastOccurrence - 1], loc))
return false; return false;
else if(lastOccurrence >= 2 && !isAllowedBeforeDriveLetter(input[lastOccurrence - 2])) else if (lastOccurrence >= 2 && !isAllowedBeforeDriveLetter(input[lastOccurrence - 2]))
return false; return false;
rawPath_out = input.substr(lastOccurrence - 1); rawPath_out = input.substr(lastOccurrence - 1);
@ -220,15 +220,15 @@ static bool getRawPath(generic_string input, generic_string &rawPath_out)
static bool getPathsForPathCompletion(generic_string input, generic_string &rawPath_out, generic_string &pathToMatch_out) static bool getPathsForPathCompletion(generic_string input, generic_string &rawPath_out, generic_string &pathToMatch_out)
{ {
generic_string rawPath; generic_string rawPath;
if(! getRawPath(input, rawPath)) if (! getRawPath(input, rawPath))
{ {
return false; return false;
} }
else if(isFile(rawPath) || isFile(removeTrailingSlash(rawPath))) else if (isFile(rawPath) || isFile(removeTrailingSlash(rawPath)))
{ {
return false; return false;
} }
else if(isDirectory(rawPath)) else if (isDirectory(rawPath))
{ {
rawPath_out = rawPath; rawPath_out = rawPath;
pathToMatch_out = rawPath; pathToMatch_out = rawPath;
@ -237,7 +237,7 @@ static bool getPathsForPathCompletion(generic_string input, generic_string &rawP
else else
{ {
size_t last_occurrence = rawPath.rfind(L"\\"); size_t last_occurrence = rawPath.rfind(L"\\");
if(last_occurrence == std::string::npos) // No match. if (last_occurrence == std::string::npos) // No match.
return false; return false;
else else
{ {
@ -270,7 +270,7 @@ void AutoCompletion::showPathCompletion()
exists, this means we should list all files and directories in C:. exists, this means we should list all files and directories in C:.
*/ */
generic_string rawPath, pathToMatch; generic_string rawPath, pathToMatch;
if(! getPathsForPathCompletion(currentLine, rawPath, pathToMatch)) if (! getPathsForPathCompletion(currentLine, rawPath, pathToMatch))
return; return;
// Get all files and directories in the path. // Get all files and directories in the path.
@ -281,7 +281,7 @@ void AutoCompletion::showPathCompletion()
generic_string pathToMatchPlusSlash = addTrailingSlash(pathToMatch); generic_string pathToMatchPlusSlash = addTrailingSlash(pathToMatch);
generic_string searchString = pathToMatchPlusSlash + TEXT("*.*"); generic_string searchString = pathToMatchPlusSlash + TEXT("*.*");
hFind = ::FindFirstFile(searchString.c_str(), &data); hFind = ::FindFirstFile(searchString.c_str(), &data);
if(hFind != INVALID_HANDLE_VALUE) if (hFind != INVALID_HANDLE_VALUE)
{ {
// Maximum number of entries to show. Without this it appears to the user like N++ hangs when autocompleting // Maximum number of entries to show. Without this it appears to the user like N++ hangs when autocompleting
// some really large directories (c:\windows\winxsys on my system for instance). // some really large directories (c:\windows\winxsys on my system for instance).
@ -289,18 +289,18 @@ void AutoCompletion::showPathCompletion()
unsigned int counter = 0; unsigned int counter = 0;
do do
{ {
if(++counter > maxEntries) if (++counter > maxEntries)
break; break;
if(generic_string(data.cFileName) == TEXT(".") || generic_string(data.cFileName) == TEXT("..")) if (generic_string(data.cFileName) == TEXT(".") || generic_string(data.cFileName) == TEXT(".."))
continue; continue;
if(! autoCompleteEntries.empty()) if (! autoCompleteEntries.empty())
autoCompleteEntries += TEXT("\n"); autoCompleteEntries += TEXT("\n");
autoCompleteEntries += pathToMatchPlusSlash; autoCompleteEntries += pathToMatchPlusSlash;
autoCompleteEntries += data.cFileName; autoCompleteEntries += data.cFileName;
if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) // If directory, add trailing slash. if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) // If directory, add trailing slash.
autoCompleteEntries += TEXT("\\"); autoCompleteEntries += TEXT("\\");
} while(::FindNextFile(hFind, &data)); } while(::FindNextFile(hFind, &data));
@ -796,7 +796,7 @@ bool AutoCompletion::setLanguage(LangType language) {
_funcCompletionActive = true; _funcCompletionActive = true;
} }
if(_funcCompletionActive) //try setting up environment if (_funcCompletionActive) //try setting up environment
{ {
//setup defaults //setup defaults
_ignoreCase = true; _ignoreCase = true;

6
PowerEditor/src/ScitillaComponent/Buffer.cpp
View File

@ -884,7 +884,7 @@ bool FileManager::backupCurrentBuffer()
UnicodeConvertor.fclose(); UnicodeConvertor.fclose();
// Note that fwrite() doesn't return the number of bytes written, but rather the number of ITEMS. // Note that fwrite() doesn't return the number of bytes written, but rather the number of ITEMS.
if(items_written == 1) // backup file has been saved if (items_written == 1) // backup file has been saved
{ {
buffer->setModifiedStatus(false); buffer->setModifiedStatus(false);
result = true; //all done result = true; //all done
@ -1014,9 +1014,9 @@ bool FileManager::saveBuffer(BufferID id, const TCHAR * filename, bool isCopy, g
// Error, we didn't write the entire document to disk. // Error, we didn't write the entire document to disk.
// Note that fwrite() doesn't return the number of bytes written, but rather the number of ITEMS. // Note that fwrite() doesn't return the number of bytes written, but rather the number of ITEMS.
if(items_written != 1) if (items_written != 1)
{ {
if(error_msg != NULL) if (error_msg != NULL)
*error_msg = TEXT("Failed to save file.\nNot enough space on disk to save file?"); *error_msg = TEXT("Failed to save file.\nNot enough space on disk to save file?");
return false; return false;

14
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -2243,7 +2243,7 @@ void FindReplaceDlg::findAllIn(InWhat op)
if (::SendMessage(_hParent, cmdid, 0, 0)) if (::SendMessage(_hParent, cmdid, 0, 0))
{ {
if(_findAllResult == 1) if (_findAllResult == 1)
wsprintf(_findAllResultStr, TEXT("1 hit")); wsprintf(_findAllResultStr, TEXT("1 hit"));
else else
wsprintf(_findAllResultStr, TEXT("%s hits"), commafyInt(_findAllResult).c_str()); wsprintf(_findAllResultStr, TEXT("%s hits"), commafyInt(_findAllResult).c_str());
@ -2982,7 +2982,7 @@ void Finder::addFileNameTitle(const TCHAR * fileName)
void Finder::addFileHitCount(int count) void Finder::addFileHitCount(int count)
{ {
TCHAR text[20]; TCHAR text[20];
if(count == 1) if (count == 1)
wsprintf(text, TEXT(" (1 hit)")); wsprintf(text, TEXT(" (1 hit)"));
else else
wsprintf(text, TEXT(" (%i hits)"), count); wsprintf(text, TEXT(" (%i hits)"), count);
@ -2996,13 +2996,13 @@ void Finder::addSearchHitCount(int count, bool isMatchLines)
{ {
const TCHAR *moreInfo = isMatchLines ? TEXT(" - Line Filter Mode: only display the filtered results") :TEXT(""); const TCHAR *moreInfo = isMatchLines ? TEXT(" - Line Filter Mode: only display the filtered results") :TEXT("");
TCHAR text[100]; TCHAR text[100];
if(count == 1 && _nbFoundFiles == 1) if (count == 1 && _nbFoundFiles == 1)
wsprintf(text, TEXT(" (1 hit in 1 file%s)"), moreInfo); wsprintf(text, TEXT(" (1 hit in 1 file%s)"), moreInfo);
else if(count == 1 && _nbFoundFiles != 1) else if (count == 1 && _nbFoundFiles != 1)
wsprintf(text, TEXT(" (1 hit in %i files%s)"), _nbFoundFiles, moreInfo); wsprintf(text, TEXT(" (1 hit in %i files%s)"), _nbFoundFiles, moreInfo);
else if(count != 1 && _nbFoundFiles == 1) else if (count != 1 && _nbFoundFiles == 1)
wsprintf(text, TEXT(" (%i hits in 1 file%s)"), count, moreInfo); wsprintf(text, TEXT(" (%i hits in 1 file%s)"), count, moreInfo);
else if(count != 1 && _nbFoundFiles != 1) else if (count != 1 && _nbFoundFiles != 1)
wsprintf(text, TEXT(" (%i hits in %i files%s)"), count, _nbFoundFiles, moreInfo); wsprintf(text, TEXT(" (%i hits in %i files%s)"), count, _nbFoundFiles, moreInfo);
setFinderReadOnly(false); setFinderReadOnly(false);
_scintView.insertGenericTextFrom(_lastSearchHeaderPos, text); _scintView.insertGenericTextFrom(_lastSearchHeaderPos, text);
@ -3558,7 +3558,7 @@ void FindIncrementDlg::setFindStatus(FindStatus iStatus, int nbCounted)
void FindIncrementDlg::addToRebar(ReBar * rebar) void FindIncrementDlg::addToRebar(ReBar * rebar)
{ {
if(_pRebar) if (_pRebar)
return; return;
_pRebar = rebar; _pRebar = rebar;

2
PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
View File

@ -268,7 +268,7 @@ bool FunctionCallTip::getCursorFunction()
bool same = false; bool same = false;
if (_funcName) if (_funcName)
{ {
if(_ignoreCase) if (_ignoreCase)
same = testNameNoCase(_funcName, funcToken.token, lstrlen(_funcName)) == 0; same = testNameNoCase(_funcName, funcToken.token, lstrlen(_funcName)) == 0;
else else
same = generic_strncmp(_funcName, funcToken.token, lstrlen(_funcName)) == 0; same = generic_strncmp(_funcName, funcToken.token, lstrlen(_funcName)) == 0;

10
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -552,7 +552,7 @@ void ScintillaEditView::setSpecialStyle(const Style & styleToSet)
void ScintillaEditView::setHotspotStyle(Style& styleToSet) void ScintillaEditView::setHotspotStyle(Style& styleToSet)
{ {
StyleMap* styleMap; StyleMap* styleMap;
if( _hotspotStyles.find(_currentBuffer) == _hotspotStyles.end() ) if ( _hotspotStyles.find(_currentBuffer) == _hotspotStyles.end() )
{ {
_hotspotStyles[_currentBuffer] = new StyleMap; _hotspotStyles[_currentBuffer] = new StyleMap;
} }
@ -2283,9 +2283,9 @@ void ScintillaEditView::beginOrEndSelect()
void ScintillaEditView::updateBeginEndSelectPosition(const bool is_insert, const int position, const int length) void ScintillaEditView::updateBeginEndSelectPosition(const bool is_insert, const int position, const int length)
{ {
if(_beginSelectPosition != -1 && position < _beginSelectPosition - 1) if (_beginSelectPosition != -1 && position < _beginSelectPosition - 1)
{ {
if(is_insert) if (is_insert)
_beginSelectPosition += length; _beginSelectPosition += length;
else else
_beginSelectPosition -= length; _beginSelectPosition -= length;
@ -3332,7 +3332,7 @@ void ScintillaEditView::insertNewLineAboveCurrentLine()
{ {
generic_string newline = getEOLString(); generic_string newline = getEOLString();
const auto current_line = getCurrentLineNumber(); const auto current_line = getCurrentLineNumber();
if(current_line == 0) if (current_line == 0)
{ {
// Special handling if caret is at first line. // Special handling if caret is at first line.
insertGenericTextFrom(0, newline.c_str()); insertGenericTextFrom(0, newline.c_str());
@ -3352,7 +3352,7 @@ void ScintillaEditView::insertNewLineBelowCurrentLine()
generic_string newline = getEOLString(); generic_string newline = getEOLString();
const auto line_count = static_cast<size_t>(execute(SCI_GETLINECOUNT)); const auto line_count = static_cast<size_t>(execute(SCI_GETLINECOUNT));
const auto current_line = getCurrentLineNumber(); const auto current_line = getCurrentLineNumber();
if(current_line == line_count - 1) if (current_line == line_count - 1)
{ {
// Special handling if caret is at last line. // Special handling if caret is at last line.
appandGenericText(newline.c_str()); appandGenericText(newline.c_str());

2
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -485,7 +485,7 @@ public:
long length = 0; long length = 0;
while(*c != '\0') while(*c != '\0')
{ {
if( (*c & 0xC0) != 0x80) if ( (*c & 0xC0) != 0x80)
++length; ++length;
++c; ++c;
} }

6
PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp
View File

@ -600,11 +600,11 @@ void XmlMatchedTagsHighlighter::tagMatch(bool doHiliteAttr)
const FindResult startFound = findText(codeBeginTag.c_str(), caret, 0, 0); // This searches backwards from "caret". const FindResult startFound = findText(codeBeginTag.c_str(), caret, 0, 0); // This searches backwards from "caret".
const FindResult endFound= findText(codeEndTag.c_str(), caret, 0, 0); // This searches backwards from "caret". const FindResult endFound= findText(codeEndTag.c_str(), caret, 0, 0); // This searches backwards from "caret".
if(startFound.success) if (startFound.success)
{ {
if(! endFound.success) if (! endFound.success)
return; return;
else if(endFound.success && endFound.start <= startFound.end) else if (endFound.success && endFound.start <= startFound.end)
return; return;
} }
} }

2
PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp
View File

@ -522,7 +522,7 @@ TiXmlNodeA* TiXmlNodeA::Identify( const char* p )
TiXmlNodeA* returnNode = 0; TiXmlNodeA* returnNode = 0;
p = SkipWhiteSpace( p ); p = SkipWhiteSpace( p );
if( !p || !*p || *p != '<' ) if ( !p || !*p || *p != '<' )
{ {
return 0; return 0;
} }

2
PowerEditor/src/TinyXml/tinyxmlparser.cpp
View File

@ -504,7 +504,7 @@ TiXmlNode* TiXmlNode::Identify( const TCHAR* p )
TiXmlNode* returnNode = 0; TiXmlNode* returnNode = 0;
p = SkipWhiteSpace( p ); p = SkipWhiteSpace( p );
if( !p || !*p || *p != '<' ) if ( !p || !*p || *p != '<' )
{ {
return 0; return 0;
} }

4
PowerEditor/src/Utf8_16.cpp
View File

@ -349,8 +349,8 @@ size_t Utf8_16_Write::fwrite(const void* p, size_t _size)
buf[bufIndex++] = iter8.get(); buf[bufIndex++] = iter8.get();
} }
++iter8; ++iter8;
if(bufIndex == bufSize || !iter8) { if (bufIndex == bufSize || !iter8) {
if(!::fwrite(buf, bufIndex*sizeof(utf16), 1, m_pFile)) return 0; if (!::fwrite(buf, bufIndex*sizeof(utf16), 1, m_pFile)) return 0;
bufIndex = 0; bufIndex = 0;
} }
} }

20
PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp
View File

@ -151,9 +151,9 @@ void URLCtrl::create(HWND itemHandle, int cmd, HWND msgDest)
void URLCtrl::destroy() void URLCtrl::destroy()
{ {
if(_hfUnderlined) if (_hfUnderlined)
::DeleteObject(_hfUnderlined); ::DeleteObject(_hfUnderlined);
if(_hCursor) if (_hCursor)
::DestroyCursor(_hCursor); ::DestroyCursor(_hCursor);
} }
@ -171,7 +171,7 @@ void URLCtrl::action()
::UpdateWindow(_hSelf); ::UpdateWindow(_hSelf);
// Open a browser // Open a browser
if(_URL != TEXT("")) if (_URL != TEXT(""))
{ {
::ShellExecute(NULL, TEXT("open"), _URL.c_str(), NULL, NULL, SW_SHOWNORMAL); ::ShellExecute(NULL, TEXT("open"), _URL.c_str(), NULL, NULL, SW_SHOWNORMAL);
} }
@ -201,9 +201,9 @@ LRESULT URLCtrl::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
DWORD dwDTStyle = DT_SINGLELINE; DWORD dwDTStyle = DT_SINGLELINE;
//Test if centered horizontally or vertically //Test if centered horizontally or vertically
if(dwStyle & SS_CENTER) dwDTStyle |= DT_CENTER; if (dwStyle & SS_CENTER) dwDTStyle |= DT_CENTER;
if(dwStyle & SS_RIGHT) dwDTStyle |= DT_RIGHT; if (dwStyle & SS_RIGHT) dwDTStyle |= DT_RIGHT;
if(dwStyle & SS_CENTERIMAGE) dwDTStyle |= DT_VCENTER; if (dwStyle & SS_CENTERIMAGE) dwDTStyle |= DT_VCENTER;
RECT rect; RECT rect;
::GetClientRect(hwnd, &rect); ::GetClientRect(hwnd, &rect);
@ -216,7 +216,7 @@ LRESULT URLCtrl::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
::SetBkColor(hdc, getCtrlBgColor(GetParent(hwnd))); ///*::GetSysColor(COLOR_3DFACE)*/); ::SetBkColor(hdc, getCtrlBgColor(GetParent(hwnd))); ///*::GetSysColor(COLOR_3DFACE)*/);
// Create an underline font // Create an underline font
if(_hfUnderlined == 0) if (_hfUnderlined == 0)
{ {
// Get the default GUI font // Get the default GUI font
LOGFONT lf; LOGFONT lf;
@ -266,7 +266,7 @@ LRESULT URLCtrl::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
break; break;
case WM_LBUTTONUP: case WM_LBUTTONUP:
if(_clicking) if (_clicking)
{ {
_clicking = false; _clicking = false;
@ -277,12 +277,12 @@ LRESULT URLCtrl::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
//Support using space to activate this object //Support using space to activate this object
case WM_KEYDOWN: case WM_KEYDOWN:
if(wParam == VK_SPACE) if (wParam == VK_SPACE)
_clicking = true; _clicking = true;
break; break;
case WM_KEYUP: case WM_KEYUP:
if(wParam == VK_SPACE && _clicking) if (wParam == VK_SPACE && _clicking)
{ {
_clicking = false; _clicking = false;

2
PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp
View File

@ -44,7 +44,7 @@ static HHOOK hookMouse = NULL;
static LRESULT CALLBACK hookProcMouse(int nCode, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK hookProcMouse(int nCode, WPARAM wParam, LPARAM lParam)
{ {
if(nCode >= 0) if (nCode >= 0)
{ {
switch (wParam) switch (wParam)
{ {

2
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp
View File

@ -510,7 +510,7 @@ void goToCenter(HWND hwnd)
::GetClientRect(hParent, &rc); ::GetClientRect(hParent, &rc);
//If window coordinates are all zero(ie,window is minimised),then assign desktop as the parent window. //If window coordinates are all zero(ie,window is minimised),then assign desktop as the parent window.
if(rc.left == 0 && rc.right == 0 && rc.top == 0 && rc.bottom == 0) if (rc.left == 0 && rc.right == 0 && rc.top == 0 && rc.bottom == 0)
{ {
//hParent = ::GetDesktopWindow(); //hParent = ::GetDesktopWindow();
::ShowWindow(hParent, SW_SHOWNORMAL); ::ShowWindow(hParent, SW_SHOWNORMAL);

2
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -2106,7 +2106,7 @@ void trim(generic_string & str)
{ {
str.erase(pos + 1); str.erase(pos + 1);
pos = str.find_first_not_of(' '); pos = str.find_first_not_of(' ');
if(pos != generic_string::npos) str.erase(0, pos); if (pos != generic_string::npos) str.erase(0, pos);
} }
else str.erase(str.begin(), str.end()); else str.erase(str.begin(), str.end());
}; };

2
PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
View File

@ -317,7 +317,7 @@ void TreeView::dragItem(HWND parentHandle, int x, int y)
hitTestInfo.pt.x = point.x; hitTestInfo.pt.x = point.x;
hitTestInfo.pt.y = point.y; hitTestInfo.pt.y = point.y;
HTREEITEM targetItem = reinterpret_cast<HTREEITEM>(::SendMessage(_hSelf, TVM_HITTEST, 0, reinterpret_cast<LPARAM>(&hitTestInfo))); HTREEITEM targetItem = reinterpret_cast<HTREEITEM>(::SendMessage(_hSelf, TVM_HITTEST, 0, reinterpret_cast<LPARAM>(&hitTestInfo)));
if(targetItem) if (targetItem)
{ {
::SendMessage(_hSelf, TVM_SELECTITEM, TVGN_DROPHILITE, reinterpret_cast<LPARAM>(targetItem)); ::SendMessage(_hSelf, TVM_SELECTITEM, TVGN_DROPHILITE, reinterpret_cast<LPARAM>(targetItem));
} }

2
PowerEditor/src/WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.cpp
View File

@ -126,7 +126,7 @@ VOID CALLBACK CReadChangesRequest::NotificationCompletion(
_ASSERTE(dwNumberOfBytesTransfered >= offsetof(FILE_NOTIFY_INFORMATION, FileName) + sizeof(WCHAR)); _ASSERTE(dwNumberOfBytesTransfered >= offsetof(FILE_NOTIFY_INFORMATION, FileName) + sizeof(WCHAR));
// This might mean overflow? Not sure. // This might mean overflow? Not sure.
if(!dwNumberOfBytesTransfered) if (!dwNumberOfBytesTransfered)
return; return;
pBlock->BackupBuffer(dwNumberOfBytesTransfered); pBlock->BackupBuffer(dwNumberOfBytesTransfered);

2
PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp
View File

@ -325,7 +325,7 @@ INT_PTR CALLBACK RunDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
if (const TCHAR *fn = fd.doOpenSingleFileDlg()) if (const TCHAR *fn = fd.doOpenSingleFileDlg())
{ {
if(wcschr(fn, ' ') != NULL) if (wcschr(fn, ' ') != NULL)
{ {
generic_string fn_quotes(fn); generic_string fn_quotes(fn);
fn_quotes = TEXT("\"") + fn_quotes + TEXT("\""); fn_quotes = TEXT("\"") + fn_quotes + TEXT("\"");

2
PowerEditor/src/WinControls/TabBar/TabBar.cpp
View File

@ -777,7 +777,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
int currentTabOn = getTabIndexAt(xPos, yPos); int currentTabOn = getTabIndexAt(xPos, yPos);
if (_isDragging) if (_isDragging)
{ {
if(::GetCapture() == _hSelf) if (::GetCapture() == _hSelf)
::ReleaseCapture(); ::ReleaseCapture();
notify(_isDraggingInside?TCN_TABDROPPED:TCN_TABDROPPEDOUTSIDE, currentTabOn); notify(_isDraggingInside?TCN_TABDROPPED:TCN_TABDROPPEDOUTSIDE, currentTabOn);

7
PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
View File

@ -246,7 +246,8 @@ void ToolBar::setToUglyIcons()
void ToolBar::reset(bool create) void ToolBar::reset(bool create)
{ {
if(create && _hSelf) { if (create && _hSelf)
{
//Store current button state information //Store current button state information
TBBUTTON tempBtn; TBBUTTON tempBtn;
for(size_t i = 0; i < _nbCurrentButtons; ++i) for(size_t i = 0; i < _nbCurrentButtons; ++i)
@ -258,7 +259,7 @@ void ToolBar::reset(bool create)
_hSelf = NULL; _hSelf = NULL;
} }
if(!_hSelf) if (!_hSelf)
{ {
_hSelf = ::CreateWindowEx( _hSelf = ::CreateWindowEx(
WS_EX_PALETTEWINDOW, WS_EX_PALETTEWINDOW,
@ -362,7 +363,7 @@ void ToolBar::doPopop(POINT chevPoint)
while(start < _nbCurrentButtons) while(start < _nbCurrentButtons)
{ {
::SendMessage(_hSelf, TB_GETITEMRECT, start, reinterpret_cast<LPARAM>(&btnRect)); ::SendMessage(_hSelf, TB_GETITEMRECT, start, reinterpret_cast<LPARAM>(&btnRect));
if(btnRect.right > width) if (btnRect.right > width)
break; break;
++start; ++start;
} }

6
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
View File

@ -62,7 +62,7 @@ inline static DWORD GetExStyle(HWND hWnd) {
inline static BOOL ModifyStyle(HWND hWnd, DWORD dwRemove, DWORD dwAdd) { inline static BOOL ModifyStyle(HWND hWnd, DWORD dwRemove, DWORD dwAdd) {
DWORD dwStyle = (DWORD)::GetWindowLongPtr(hWnd, GWL_STYLE); DWORD dwStyle = (DWORD)::GetWindowLongPtr(hWnd, GWL_STYLE);
DWORD dwNewStyle = (dwStyle & ~dwRemove) | dwAdd; DWORD dwNewStyle = (dwStyle & ~dwRemove) | dwAdd;
if(dwStyle == dwNewStyle) if (dwStyle == dwNewStyle)
return FALSE; return FALSE;
::SetWindowLongPtr(hWnd, GWL_STYLE, dwNewStyle); ::SetWindowLongPtr(hWnd, GWL_STYLE, dwNewStyle);
return TRUE; return TRUE;
@ -71,7 +71,7 @@ inline static BOOL ModifyStyle(HWND hWnd, DWORD dwRemove, DWORD dwAdd) {
inline static BOOL ModifyStyleEx(HWND hWnd, DWORD dwRemove, DWORD dwAdd) { inline static BOOL ModifyStyleEx(HWND hWnd, DWORD dwRemove, DWORD dwAdd) {
DWORD dwStyle = (DWORD)::GetWindowLongPtr(hWnd, GWL_EXSTYLE); DWORD dwStyle = (DWORD)::GetWindowLongPtr(hWnd, GWL_EXSTYLE);
DWORD dwNewStyle = (dwStyle & ~dwRemove) | dwAdd; DWORD dwNewStyle = (dwStyle & ~dwRemove) | dwAdd;
if(dwStyle == dwNewStyle) if (dwStyle == dwNewStyle)
return FALSE; return FALSE;
::SetWindowLongPtr(hWnd, GWL_EXSTYLE, dwNewStyle); ::SetWindowLongPtr(hWnd, GWL_EXSTYLE, dwNewStyle);
return TRUE; return TRUE;
@ -306,7 +306,7 @@ INT_PTR CALLBACK WindowsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPa
{ {
NMLVDISPINFO *pLvdi = (NMLVDISPINFO *)pNMHDR; NMLVDISPINFO *pLvdi = (NMLVDISPINFO *)pNMHDR;
if(pLvdi->item.mask & LVIF_TEXT) if (pLvdi->item.mask & LVIF_TEXT)
{ {
pLvdi->item.pszText[0] = 0; pLvdi->item.pszText[0] = 0;
size_t index = pLvdi->item.iItem; size_t index = pLvdi->item.iItem;

4
PowerEditor/src/WinControls/shortcut/shortcut.cpp
View File

@ -223,7 +223,7 @@ KeyCombo ScintillaKeyMap::getKeyComboByIndex(size_t index) const {
void ScintillaKeyMap::setKeyComboByIndex(int index, KeyCombo combo) void ScintillaKeyMap::setKeyComboByIndex(int index, KeyCombo combo)
{ {
if(combo._key == 0 && (_size > 1)) if (combo._key == 0 && (_size > 1))
{ //remove the item if possible { //remove the item if possible
_keyCombos.erase(_keyCombos.begin() + index); _keyCombos.erase(_keyCombos.begin() + index);
} }
@ -837,7 +837,7 @@ void recordedMacroStep::PlayBack(Window* pNotepad, ScintillaEditView *pEditView)
scnN.nmhdr.code = SCN_CHARADDED; scnN.nmhdr.code = SCN_CHARADDED;
scnN.nmhdr.hwndFrom = pEditView->getHSelf(); scnN.nmhdr.hwndFrom = pEditView->getHSelf();
scnN.nmhdr.idFrom = 0; scnN.nmhdr.idFrom = 0;
if(_sParameter.empty()) if (_sParameter.empty())
scnN.ch = 0; scnN.ch = 0;
else else
scnN.ch = _sParameter.at(0); scnN.ch = _sParameter.at(0);

2
PowerEditor/src/WinControls/shortcut/shortcut.h
View File

@ -154,7 +154,7 @@ public:
virtual generic_string toString() const; //the hotkey part virtual generic_string toString() const; //the hotkey part
generic_string toMenuItemString() const { //generic_string suitable for menu generic_string toMenuItemString() const { //generic_string suitable for menu
generic_string str = _menuName; generic_string str = _menuName;
if(isEnabled()) if (isEnabled())
{ {
str += TEXT("\t"); str += TEXT("\t");
str += toString(); str += toString();

2
PowerEditor/src/uchardet/nsLatin1Prober.cpp
View File

@ -154,7 +154,7 @@ float nsLatin1Prober::GetConfidence(void)
for (PRInt32 i = 0; i < FREQ_CAT_NUM; i++) for (PRInt32 i = 0; i < FREQ_CAT_NUM; i++)
total += mFreqCounter[i]; total += mFreqCounter[i];
if(!total) if (!total)
confidence = 0.0f; confidence = 0.0f;
else else
{ {

2
PowerEditor/src/uchardet/nsUniversalDetector.cpp
View File

@ -102,7 +102,7 @@ nsUniversalDetector::Reset()
nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen) nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
{ {
if(mDone) if (mDone)
return NS_OK; return NS_OK;
if (aLen > 0) if (aLen > 0)