From 593cf451fb3265eb0433d48c0b0d2cac5d4953a3 Mon Sep 17 00:00:00 2001 From: Don HO Date: Sun, 24 Jun 2018 01:16:01 +0200 Subject: [PATCH] Clean up --- PowerEditor/src/Notepad_plus.cpp | 1 - PowerEditor/src/Notepad_plus.rc | 7 +------ PowerEditor/src/Notepad_plus_Window.cpp | 1 - PowerEditor/src/NppCommands.cpp | 3 --- PowerEditor/src/Parameters.h | 1 - .../src/ScitillaComponent/ScintillaEditView.cpp | 1 - .../src/WinControls/OpenSaveFileDialog/FileDialog.cpp | 10 +++------- 7 files changed, 4 insertions(+), 20 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index f9863835d..970000d63 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -6835,6 +6835,5 @@ bool Notepad_plus::undoStreamComment(bool tryBlockComment) } } while(1); //do as long as stream-comments are within selection - //return retVal; } diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 8cda6f2da..a6be2c1fd 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -501,7 +501,6 @@ BEGIN MENUITEM "Word wrap", IDM_VIEW_WRAP MENUITEM "Focus on Another View", IDM_VIEW_SWITCHTO_OTHER_VIEW MENUITEM "Hide Lines", IDM_VIEW_HIDELINES - //MENUITEM "User-Defined Dialogue...", IDM_VIEW_USER_DLG MENUITEM SEPARATOR MENUITEM "Fold All", IDM_VIEW_TOGGLE_FOLDALL MENUITEM "Unfold All", IDM_VIEW_TOGGLE_UNFOLDALL @@ -592,7 +591,6 @@ BEGIN POPUP "Central European" BEGIN - //MENUITEM "ISO 8859-16", IDM_FORMAT_ISO_8859_16 MENUITEM "OEM 852", IDM_FORMAT_DOS_852 MENUITEM "Windows-1250", IDM_FORMAT_WIN_1250 END @@ -642,8 +640,7 @@ BEGIN POPUP "Thai" BEGIN - //MENUITEM "ISO 8859-11", IDM_FORMAT_ISO_8859_11 - MENUITEM "TIS-620", IDM_FORMAT_TIS_620 + MENUITEM "TIS-620", IDM_FORMAT_TIS_620 END POPUP "Turkish" @@ -953,12 +950,10 @@ BEGIN POPUP "&?" BEGIN - //MENUITEM "Help Contents", IDM_HELP MENUITEM "Command Line Arguments...", IDM_CMDLINEARGUMENTS MENUITEM SEPARATOR MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE - //MENUITEM "Online Documentation", IDM_ONLINEHELP MENUITEM "Notepad++ Community (Forum)", IDM_FORUM MENUITEM "Live Support", IDM_ONLINESUPPORT MENUITEM "Get More Plugins", IDM_PLUGINSHOME diff --git a/PowerEditor/src/Notepad_plus_Window.cpp b/PowerEditor/src/Notepad_plus_Window.cpp index 3e2937d84..b01d4bbe7 100644 --- a/PowerEditor/src/Notepad_plus_Window.cpp +++ b/PowerEditor/src/Notepad_plus_Window.cpp @@ -246,7 +246,6 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin if (!cmdLineParams->_easterEggName.empty()) { - //::MessageBoxA(NULL, destStr.c_str(), "", MB_OK); if (cmdLineParams->_quoteType == 0) // Easter Egg Name { int iQuote = _notepad_plus_plus_core.getQuoteIndexFrom(cmdLineParams->_easterEggName.c_str()); diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 8d30035e6..a17d2c5a8 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -2169,12 +2169,9 @@ void Notepad_plus::command(int id) case IDM_FORMAT_ISO_8859_7 : case IDM_FORMAT_ISO_8859_8 : case IDM_FORMAT_ISO_8859_9 : - //case IDM_FORMAT_ISO_8859_10 : - //case IDM_FORMAT_ISO_8859_11 : case IDM_FORMAT_ISO_8859_13 : case IDM_FORMAT_ISO_8859_14 : case IDM_FORMAT_ISO_8859_15 : - //case IDM_FORMAT_ISO_8859_16 : case IDM_FORMAT_DOS_437 : case IDM_FORMAT_DOS_720 : case IDM_FORMAT_DOS_737 : diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index f50eea8b4..5a16d0df8 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -91,7 +91,6 @@ enum ChangeDetect {cdDisabled=0, cdEnabled=1, cdAutoUpdate=2, cdGo2end=3, cdAuto enum BackupFeature {bak_none = 0, bak_simple = 1, bak_verbose = 2}; enum OpenSaveDirSetting {dir_followCurrent = 0, dir_last = 1, dir_userDef = 2}; enum MultiInstSetting {monoInst = 0, multiInstOnSession = 1, multiInst = 2}; -//enum CloudChoice {noCloud = 0, dropbox = 1, oneDrive = 2, googleDrive = 3}; const int LANG_INDEX_INSTR = 0; const int LANG_INDEX_INSTR2 = 1; diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index c988dcbea..3baa5d17b 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -54,7 +54,6 @@ UserDefineDialog ScintillaEditView::_userDefineDlg; const int ScintillaEditView::_SC_MARGE_LINENUMBER = 0; const int ScintillaEditView::_SC_MARGE_SYBOLE = 1; const int ScintillaEditView::_SC_MARGE_FOLDER = 2; -//const int ScintillaEditView::_SC_MARGE_MODIFMARKER = 3; WNDPROC ScintillaEditView::_scintillaDefaultProc = NULL; string ScintillaEditView::_defaultCharList = ""; diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp index b9a9586d8..adc423a5b 100644 --- a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp +++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp @@ -34,15 +34,13 @@ #include FileDialog *FileDialog::staticThis = NULL; -//int FileDialog::_dialogFileBoxId = (NppParameters::getInstance())->getWinVersion() < WV_W2K?edt1:cmb13; FileDialog::FileDialog(HWND hwnd, HINSTANCE hInst) : _nbCharFileExt(0), _nbExt(0), _fileExt(NULL), _extTypeIndex(-1) { staticThis = this; - //for (int i = 0 ; i < nbExtMax ; i++) - // _extArray[i][0] = '\0'; - memset(_fileName, 0, sizeof(_fileName)); + + memset(_fileName, 0, sizeof(_fileName)); _winVersion = (NppParameters::getInstance())->getWinVersion(); _ofn.lStructSize = sizeof(_ofn); @@ -200,7 +198,6 @@ stringVector * FileDialog::doOpenMultiFilesDlg() { TCHAR dir[MAX_PATH]; ::GetCurrentDirectory(MAX_PATH, dir); - //_ofn.lpstrInitialDir = dir; NppParameters * params = NppParameters::getInstance(); _ofn.lpstrInitialDir = params->getWorkingDir(); @@ -257,8 +254,7 @@ stringVector * FileDialog::doOpenMultiFilesDlg() TCHAR * FileDialog::doSaveDlg() { TCHAR dir[MAX_PATH]; - ::GetCurrentDirectory(MAX_PATH, dir); - //_ofn.lpstrInitialDir = dir; + ::GetCurrentDirectory(MAX_PATH, dir); NppParameters * params = NppParameters::getInstance(); _ofn.lpstrInitialDir = params->getWorkingDir();