From eb8eb25799f105c03772f21c2b7361a165e828a5 Mon Sep 17 00:00:00 2001 From: Rajendra Singh Date: Mon, 28 Jan 2019 19:54:41 +0530 Subject: [PATCH] Make naming homogeneous in xml file No more dummy surprises. Close #5276 --- PowerEditor/src/EncodingMapper.h | 2 +- PowerEditor/src/MISC/Common/Common.h | 1 + PowerEditor/src/Notepad_plus.cpp | 2 -- PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/PowerEditor/src/EncodingMapper.h b/PowerEditor/src/EncodingMapper.h index 2f867933..cba52a65 100644 --- a/PowerEditor/src/EncodingMapper.h +++ b/PowerEditor/src/EncodingMapper.h @@ -44,6 +44,6 @@ private: EncodingMapper(){}; ~EncodingMapper(){}; static EncodingMapper *_pSelf; - EncodingUnit *_encodings; + EncodingUnit* _encodings = nullptr; }; diff --git a/PowerEditor/src/MISC/Common/Common.h b/PowerEditor/src/MISC/Common/Common.h index 4daebe18..c56a7ff8 100644 --- a/PowerEditor/src/MISC/Common/Common.h +++ b/PowerEditor/src/MISC/Common/Common.h @@ -63,6 +63,7 @@ const bool dirDown = false; #define generic_fopen _wfopen #define generic_fgets fgetws #define COPYDATA_FILENAMES COPYDATA_FILENAMESW +#define NPP_INTERNAL_FUCTION_STR TEXT("Notepad++::InternalFunction") typedef std::basic_string generic_string; typedef std::basic_stringstream generic_stringstream; diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index e9060b47..b4e54fb1 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -57,8 +57,6 @@ enum tb_stat {tb_saved, tb_unsaved, tb_ro}; #define DIR_LEFT true #define DIR_RIGHT false -#define NPP_INTERNAL_FUCTION_STR TEXT("Notepad++::InternalFunction") - int docTabIconIDs[] = {IDI_SAVED_ICON, IDI_UNSAVED_ICON, IDI_READONLY_ICON, IDI_MONITORING_ICON}; ToolBarButtonUnit toolBarIcons[] = { diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 3d8c5362..3e6ea862 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -2184,7 +2184,7 @@ void FindReplaceDlg::findAllIn(InWhat op) data.hIconTab = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.pszAddInfo = _findAllResultStr; - data.pszModuleName = TEXT("dummy"); + data.pszModuleName = NPP_INTERNAL_FUCTION_STR; // the dlgDlg should be the index of funcItem where the current function pointer is // in this case is DOCKABLE_DEMO_INDEX @@ -2276,7 +2276,7 @@ Finder * FindReplaceDlg::createFinder() data.hIconTab = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.pszAddInfo = _findAllResultStr; - data.pszModuleName = TEXT("dummy"); + data.pszModuleName = NPP_INTERNAL_FUCTION_STR; // the dlgDlg should be the index of funcItem where the current function pointer is // in this case is DOCKABLE_DEMO_INDEX