Renamed variable and corrected typo

SinghRajenM · SinghRajenM · commit a765bbe2142c · 2023-12-31T11:27:20.000+05:30
diff --git a/NppJSONViewer/NppJsonViewer/AboutDlg.cpp b/NppJSONViewer/NppJsonViewer/AboutDlg.cpp
@@ -7,11 +7,11 @@
 #include <commctrl.h>
 
 
-AboutDlg::AboutDlg(HINSTANCE hIntance, HWND hParent, int nCmdId)
+AboutDlg::AboutDlg(HINSTANCE hInstance, HWND hParent, int nCmdId)
     : m_nCmdId(nCmdId)
     , StaticDialog()
 {
-    init(hIntance, hParent);
+    init(hInstance, hParent);
 }
 
 
diff --git a/NppJSONViewer/NppJsonViewer/AboutDlg.h b/NppJSONViewer/NppJsonViewer/AboutDlg.h
@@ -4,7 +4,7 @@
 class AboutDlg : public StaticDialog
 {
 public:
-    AboutDlg(HINSTANCE hIntance, HWND hParent, int nCmdId);
+    AboutDlg(HINSTANCE hInstance, HWND hParent, int nCmdId);
     ~AboutDlg() = default;
 
     bool ShowDlg(bool bShow);
diff --git a/NppJSONViewer/NppJsonViewer/JsonViewDlg.cpp b/NppJSONViewer/NppJsonViewer/JsonViewDlg.cpp
@@ -9,7 +9,7 @@
 #include <regex>
 
 
-JsonViewDlg::JsonViewDlg(HINSTANCE hIntance, const NppData &nppData, const bool &isReady, int nCmdId, std::shared_ptr<Setting> &pSetting)
+JsonViewDlg::JsonViewDlg(HINSTANCE hInstance, const NppData &nppData, const bool &isReady, int nCmdId, std::shared_ptr<Setting> &pSetting)
     : DockingDlgInterface(IDD_TREEDLG)
     , m_NppData(nppData)
     , m_IsNppReady(isReady)
@@ -19,7 +19,7 @@ JsonViewDlg::JsonViewDlg(HINSTANCE hIntance, const NppData &nppData, const bool
     , m_pSetting(pSetting)
 {
     _hParent = nppData._nppHandle;
-    _hInst   = hIntance;
+    _hInst   = hInstance;
 }
 
 JsonViewDlg::~JsonViewDlg()
@@ -77,7 +77,7 @@ void JsonViewDlg::FormatJson()
     if (res.success)
     {
         m_Editor->ReplaceSelection(res.response);
-        HightlightAsJson();
+        HighlightAsJson();
     }
     else
     {
@@ -98,7 +98,7 @@ void JsonViewDlg::CompressJson()
     if (res.success)
     {
         m_Editor->ReplaceSelection(res.response);
-        HightlightAsJson();
+        HighlightAsJson();
     }
     else
     {
@@ -152,7 +152,7 @@ bool JsonViewDlg::CheckForTokenUndefined(eMethod method, std::string selectedTex
                 if (res.success)
                 {
                     m_Editor->ReplaceSelection((method == eMethod::ParseJson || method == eMethod::ValidateJson) ? text : res.response);
-                    HightlightAsJson();
+                    HighlightAsJson();
                     return true;
                 }
                 else
@@ -257,7 +257,7 @@ void JsonViewDlg::DrawJsonTree()
     EnableControls(ctrls, true);
 }
 
-void JsonViewDlg::HightlightAsJson(bool bForcefully) const
+void JsonViewDlg::HighlightAsJson(bool bForcefully) const
 {
     bool setJsonLang = bForcefully || m_pSetting->bUseJsonHighlight;
     if (setJsonLang)
@@ -295,7 +295,7 @@ auto JsonViewDlg::PopulateTreeUsingSax(HTREEITEM tree_root, const std::string &j
     }
     else
     {
-        HightlightAsJson();
+        HighlightAsJson();
     }
 
     return retVal;
@@ -338,7 +338,7 @@ void JsonViewDlg::SearchInTree()
     static std::wstring previousSearch;
     static HTREEITEM    nextNode = m_hTreeView->NextItem(m_hTreeView->GetRoot());
 
-    // New search, hence search from begining
+    // New search, hence search from beginning
     if (previousSearch != itemToSearch)
     {
         previousSearch = itemToSearch;
@@ -372,7 +372,7 @@ void JsonViewDlg::SearchInTree()
 
             // Search in node value
             //  1. If both key and value are not equal
-            //  2. If both are euaal, but not all three (key, value and keyValue)
+            //  2. If both are equal, but not all three (key, value and keyValue)
             //  3. If all three equal, but key does not start with '[' and end with ']'
 
             bool shouldSearch = (nodeKey != nodeVal);
diff --git a/NppJSONViewer/NppJsonViewer/JsonViewDlg.h b/NppJSONViewer/NppJsonViewer/JsonViewDlg.h
@@ -29,7 +29,7 @@ class JsonViewDlg : public DockingDlgInterface
     };
 
 public:
-    JsonViewDlg(HINSTANCE hIntance, const NppData &nppData, const bool &isReady, int nCmdId, std::shared_ptr<Setting> &pSetting);
+    JsonViewDlg(HINSTANCE hInstance, const NppData &nppData, const bool &isReady, int nCmdId, std::shared_ptr<Setting> &pSetting);
     virtual ~JsonViewDlg();
 
     void ShowDlg(bool bShow);
@@ -42,7 +42,7 @@ class JsonViewDlg : public DockingDlgInterface
 
 private:
     void DrawJsonTree();
-    void HightlightAsJson(bool bForcefully = false) const;
+    void HighlightAsJson(bool bForcefully = false) const;
     auto PopulateTreeUsingSax(HTREEITEM tree_root, const std::string &jsonText) -> std::optional<std::wstring>;
 
     void ValidateJson();
diff --git a/NppJSONViewer/NppJsonViewer/NppJsonPlugin.cpp b/NppJSONViewer/NppJsonViewer/NppJsonPlugin.cpp
@@ -70,7 +70,7 @@ void NppJsonPlugin::ProcessNotification(const SCNotification *notifyCode)
 
     case NPPN_READY:
     {
-        // This is work arround where dialog does not show tree on launch
+        // This is workaround where dialog does not show tree on launch
         if (m_pJsonViewDlg && m_pJsonViewDlg->isVisible() && !m_bAboutToClose)
         {
             ::SendMessage(m_pJsonViewDlg->getHSelf(), WM_COMMAND, IDC_BTN_REFRESH, 0);
@@ -132,9 +132,9 @@ void NppJsonPlugin::InitToolbarIcon()
     auto dpi                 = GetDeviceCaps(GetWindowDC(m_NppData._nppHandle), LOGPIXELSX);
     int  size                = 16 * dpi / 96;
     m_hMenuIcon.hToolbarIcon = reinterpret_cast<HICON>(::LoadImage(static_cast<HINSTANCE>(m_hModule), MAKEINTRESOURCE(IDI_ICON_TOOLBAR), IMAGE_ICON, size, size, 0));
-    ICONINFO iconinfo;
-    GetIconInfo(m_hMenuIcon.hToolbarIcon, &iconinfo);
-    m_hMenuIcon.hToolbarBmp = iconinfo.hbmColor;
+    ICONINFO iconInfo;
+    GetIconInfo(m_hMenuIcon.hToolbarIcon, &iconInfo);
+    m_hMenuIcon.hToolbarBmp = iconInfo.hbmColor;
 }
 
 void NppJsonPlugin::InitConfigPath()
diff --git a/NppJSONViewer/NppJsonViewer/SettingsDlg.cpp b/NppJSONViewer/NppJsonViewer/SettingsDlg.cpp
@@ -6,13 +6,13 @@
 #include <Uxtheme.h>
 
 
-SettingsDlg::SettingsDlg(HINSTANCE hIntance, HWND hParent, int nCmdId, const std::wstring &configPath, std::shared_ptr<Setting> &pSetting)
+SettingsDlg::SettingsDlg(HINSTANCE hInstance, HWND hParent, int nCmdId, const std::wstring &configPath, std::shared_ptr<Setting> &pSetting)
     : m_nCmdId(nCmdId)
     , m_configPath(configPath)
     , StaticDialog()
     , m_pSetting(pSetting)
 {
-    init(hIntance, hParent);
+    init(hInstance, hParent);
 }
 
 
diff --git a/NppJSONViewer/NppJsonViewer/SettingsDlg.h b/NppJSONViewer/NppJsonViewer/SettingsDlg.h
@@ -7,7 +7,7 @@
 class SettingsDlg : public StaticDialog
 {
 public:
-    SettingsDlg(HINSTANCE hIntance, HWND hParent, int nCmdId, const std::wstring &configPath, std::shared_ptr<Setting> &pSetting);
+    SettingsDlg(HINSTANCE hInstance, HWND hParent, int nCmdId, const std::wstring &configPath, std::shared_ptr<Setting> &pSetting);
     ~SettingsDlg() = default;
 
     bool ShowDlg(bool bShow);
diff --git a/NppJSONViewer/NppJsonViewer/TreeViewCtrl.cpp b/NppJSONViewer/NppJsonViewer/TreeViewCtrl.cpp
@@ -109,15 +109,15 @@ bool TreeViewCtrl::IsThisOrAnyChildCollapsed(HTREEITEM node) const
 
 void TreeViewCtrl::Expand(HTREEITEM node) const
 {
-    ExpandOrCollpase(node, TVE_EXPAND);
+    ExpandOrCollapse(node, TVE_EXPAND);
 }
 
 void TreeViewCtrl::Collapse(HTREEITEM node) const
 {
-    ExpandOrCollpase(node, TVE_COLLAPSE);
+    ExpandOrCollapse(node, TVE_COLLAPSE);
 }
 
-void TreeViewCtrl::ExpandOrCollpase(HTREEITEM node, UINT_PTR code) const
+void TreeViewCtrl::ExpandOrCollapse(HTREEITEM node, UINT_PTR code) const
 {
     TreeView_Expand(m_hTree, node, code);
 }
@@ -235,7 +235,7 @@ auto TreeViewCtrl::GetNodePath(HTREEITEM hti) const -> std::wstring
 
         if (!nodeKey.empty())
         {
-            // remove " from the beinging and end
+            // remove " from the beginning and end
             if (nodeKey[0] == TEXT('"'))
                 nodeKey.erase(0, 1);
             if (nodeKey[nodeKey.size() - 1] == TEXT('"'))
@@ -262,7 +262,7 @@ auto TreeViewCtrl::GetNodePath(HTREEITEM hti) const -> std::wstring
         hitTravel           = htiParent;
     }
 
-    // remove trailling dot (.)
+    // remove trailing dot (.)
     wstrJsonPath.pop_back();
 
     return wstrJsonPath;
@@ -295,7 +295,7 @@ HTREEITEM TreeViewCtrl::GetParentItem(HTREEITEM hti) const
 
 /*
  * Get next item of current item on the TreeView.
- * If current item has a child (or chidren) item, next will be the first child item.
+ * If current item has a child (or children) item, next will be the first child item.
  * If current item has no child, next will be its sibling item.
  * If current item has no child and no sibling, next will be its parent's (parent's parent's ...) sibling item.
  * If current item's parent is ROOT and has no sibling item, it will return NULL.
diff --git a/NppJSONViewer/NppJsonViewer/TreeViewCtrl.h b/NppJSONViewer/NppJsonViewer/TreeViewCtrl.h
@@ -57,7 +57,7 @@ class TreeViewCtrl
     auto GetNodePath(HTREEITEM hti) const -> std::wstring;
 
 private:
-    void ExpandOrCollpase(HTREEITEM node, UINT_PTR code) const;
+    void ExpandOrCollapse(HTREEITEM node, UINT_PTR code) const;
 
     HTREEITEM GetParentItem(HTREEITEM hti) const;
 
diff --git a/NppJSONViewer/UtilityLib/Utility.cpp b/NppJSONViewer/UtilityLib/Utility.cpp
@@ -220,14 +220,14 @@ bool CUtility::OpenFileDlg(std::wstring &filePath, const std::wstring &dlgTitle,
 
     if (::GetOpenFileName(&ofn) != FALSE)
     {
-        filePath = ofn.lpstrFile;    // will have the full pathand file name.
+        filePath = ofn.lpstrFile;    // will have the full path and file name.
         bRetVal  = true;
     }
 
     return bRetVal;
 }
 
-bool CUtility::CopyToClipboard(const std::wstring &str2cpy, HWND hwnd)
+bool CUtility::CopyToClipboard(const std::wstring &str2cpy, HWND hWnd)
 {
     size_t  len2Allocate = (str2cpy.size() + 1) * sizeof(TCHAR);
     HGLOBAL hglbCopy     = ::GlobalAlloc(GMEM_MOVEABLE, len2Allocate);
@@ -236,7 +236,7 @@ bool CUtility::CopyToClipboard(const std::wstring &str2cpy, HWND hwnd)
         return false;
     }
 
-    if (!::OpenClipboard(hwnd))
+    if (!::OpenClipboard(hWnd))
     {
         ::GlobalFree(hglbCopy);
         ::CloseClipboard();
diff --git a/NppJSONViewer/UtilityLib/Utility.h b/NppJSONViewer/UtilityLib/Utility.h
@@ -43,7 +43,7 @@ class CUtility
 
     static bool OpenFileDlg(std::wstring &filePath, const std::wstring &dlgTitle, const std::vector<wchar_t> &dlgFilter, DWORD flags = 0);
 
-    static bool CopyToClipboard(const std::wstring &str2cpy, HWND hwnd);
+    static bool CopyToClipboard(const std::wstring &str2cpy, HWND hWnd);
 
     static bool IsNumber(const std::wstring &str);
     static auto GetNumber(const std::wstring &str) -> std::optional<int>;

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@`
`7`	`7`	`#include <commctrl.h>`
`8`	`8`
`9`	`9`
`10`		`-AboutDlg::AboutDlg(HINSTANCE hIntance, HWND hParent, int nCmdId)`
	`10`	`+AboutDlg::AboutDlg(HINSTANCE hInstance, HWND hParent, int nCmdId)`
`11`	`11`	`: m_nCmdId(nCmdId)`
`12`	`12`	`, StaticDialog()`
`13`	`13`	`{`
`14`		`- init(hIntance, hParent);`
	`14`	`+ init(hInstance, hParent);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`class AboutDlg : public StaticDialog`
`5`	`5`	`{`
`6`	`6`	`public:`
`7`		`- AboutDlg(HINSTANCE hIntance, HWND hParent, int nCmdId);`
	`7`	`+ AboutDlg(HINSTANCE hInstance, HWND hParent, int nCmdId);`
`8`	`8`	`~AboutDlg() = default;`
`9`	`9`
`10`	`10`	`bool ShowDlg(bool bShow);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#include <regex>`
`10`	`10`
`11`	`11`
`12`		`-JsonViewDlg::JsonViewDlg(HINSTANCE hIntance, const NppData &nppData, const bool &isReady, int nCmdId, std::shared_ptr<Setting> &pSetting)`
	`12`	`+JsonViewDlg::JsonViewDlg(HINSTANCE hInstance, const NppData &nppData, const bool &isReady, int nCmdId, std::shared_ptr<Setting> &pSetting)`
`13`	`13`	`: DockingDlgInterface(IDD_TREEDLG)`
`14`	`14`	`, m_NppData(nppData)`
`15`	`15`	`, m_IsNppReady(isReady)`
`@@ -19,7 +19,7 @@ JsonViewDlg::JsonViewDlg(HINSTANCE hIntance, const NppData &nppData, const bool`
`19`	`19`	`, m_pSetting(pSetting)`
`20`	`20`	`{`
`21`	`21`	`_hParent = nppData._nppHandle;`
`22`		`- _hInst = hIntance;`
	`22`	`+ _hInst = hInstance;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`JsonViewDlg::~JsonViewDlg()`
`@@ -77,7 +77,7 @@ void JsonViewDlg::FormatJson()`
`77`	`77`	`if (res.success)`
`78`	`78`	`{`
`79`	`79`	`m_Editor->ReplaceSelection(res.response);`
`80`		`- HightlightAsJson();`
	`80`	`+ HighlightAsJson();`
`81`	`81`	`}`
`82`	`82`	`else`
`83`	`83`	`{`
`@@ -98,7 +98,7 @@ void JsonViewDlg::CompressJson()`
`98`	`98`	`if (res.success)`
`99`	`99`	`{`
`100`	`100`	`m_Editor->ReplaceSelection(res.response);`
`101`		`- HightlightAsJson();`
	`101`	`+ HighlightAsJson();`
`102`	`102`	`}`
`103`	`103`	`else`
`104`	`104`	`{`
`@@ -152,7 +152,7 @@ bool JsonViewDlg::CheckForTokenUndefined(eMethod method, std::string selectedTex`
`152`	`152`	`if (res.success)`
`153`	`153`	`{`
`154`	`154`	`m_Editor->ReplaceSelection((method == eMethod::ParseJson \|\| method == eMethod::ValidateJson) ? text : res.response);`
`155`		`- HightlightAsJson();`
	`155`	`+ HighlightAsJson();`
`156`	`156`	`return true;`
`157`	`157`	`}`
`158`	`158`	`else`
`@@ -257,7 +257,7 @@ void JsonViewDlg::DrawJsonTree()`
`257`	`257`	`EnableControls(ctrls, true);`
`258`	`258`	`}`
`259`	`259`
`260`		`-void JsonViewDlg::HightlightAsJson(bool bForcefully) const`
	`260`	`+void JsonViewDlg::HighlightAsJson(bool bForcefully) const`
`261`	`261`	`{`
`262`	`262`	`bool setJsonLang = bForcefully \|\| m_pSetting->bUseJsonHighlight;`
`263`	`263`	`if (setJsonLang)`
`@@ -295,7 +295,7 @@ auto JsonViewDlg::PopulateTreeUsingSax(HTREEITEM tree_root, const std::string &j`
`295`	`295`	`}`
`296`	`296`	`else`
`297`	`297`	`{`
`298`		`- HightlightAsJson();`
	`298`	`+ HighlightAsJson();`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`return retVal;`
`@@ -338,7 +338,7 @@ void JsonViewDlg::SearchInTree()`
`338`	`338`	`static std::wstring previousSearch;`
`339`	`339`	`static HTREEITEM nextNode = m_hTreeView->NextItem(m_hTreeView->GetRoot());`
`340`	`340`
`341`		`- // New search, hence search from begining`
	`341`	`+ // New search, hence search from beginning`
`342`	`342`	`if (previousSearch != itemToSearch)`
`343`	`343`	`{`
`344`	`344`	`previousSearch = itemToSearch;`
`@@ -372,7 +372,7 @@ void JsonViewDlg::SearchInTree()`
`372`	`372`
`373`	`373`	`// Search in node value`
`374`	`374`	`// 1. If both key and value are not equal`
`375`		`- // 2. If both are euaal, but not all three (key, value and keyValue)`
	`375`	`+ // 2. If both are equal, but not all three (key, value and keyValue)`
`376`	`376`	`// 3. If all three equal, but key does not start with '[' and end with ']'`
`377`	`377`
`378`	`378`	`bool shouldSearch = (nodeKey != nodeVal);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void NppJsonPlugin::ProcessNotification(const SCNotification *notifyCode)`
`70`	`70`
`71`	`71`	`case NPPN_READY:`
`72`	`72`	`{`
`73`		`- // This is work arround where dialog does not show tree on launch`
	`73`	`+ // This is workaround where dialog does not show tree on launch`
`74`	`74`	`if (m_pJsonViewDlg && m_pJsonViewDlg->isVisible() && !m_bAboutToClose)`
`75`	`75`	`{`
`76`	`76`	`::SendMessage(m_pJsonViewDlg->getHSelf(), WM_COMMAND, IDC_BTN_REFRESH, 0);`
`@@ -132,9 +132,9 @@ void NppJsonPlugin::InitToolbarIcon()`
`132`	`132`	`auto dpi = GetDeviceCaps(GetWindowDC(m_NppData._nppHandle), LOGPIXELSX);`
`133`	`133`	`int size = 16 * dpi / 96;`
`134`	`134`	`m_hMenuIcon.hToolbarIcon = reinterpret_cast<HICON>(::LoadImage(static_cast<HINSTANCE>(m_hModule), MAKEINTRESOURCE(IDI_ICON_TOOLBAR), IMAGE_ICON, size, size, 0));`
`135`		`- ICONINFO iconinfo;`
`136`		`- GetIconInfo(m_hMenuIcon.hToolbarIcon, &iconinfo);`
`137`		`- m_hMenuIcon.hToolbarBmp = iconinfo.hbmColor;`
	`135`	`+ ICONINFO iconInfo;`
	`136`	`+ GetIconInfo(m_hMenuIcon.hToolbarIcon, &iconInfo);`
	`137`	`+ m_hMenuIcon.hToolbarBmp = iconInfo.hbmColor;`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`void NppJsonPlugin::InitConfigPath()`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@`
`6`	`6`	`#include <Uxtheme.h>`
`7`	`7`
`8`	`8`
`9`		`-SettingsDlg::SettingsDlg(HINSTANCE hIntance, HWND hParent, int nCmdId, const std::wstring &configPath, std::shared_ptr<Setting> &pSetting)`
	`9`	`+SettingsDlg::SettingsDlg(HINSTANCE hInstance, HWND hParent, int nCmdId, const std::wstring &configPath, std::shared_ptr<Setting> &pSetting)`
`10`	`10`	`: m_nCmdId(nCmdId)`
`11`	`11`	`, m_configPath(configPath)`
`12`	`12`	`, StaticDialog()`
`13`	`13`	`, m_pSetting(pSetting)`
`14`	`14`	`{`
`15`		`- init(hIntance, hParent);`
	`15`	`+ init(hInstance, hParent);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`class SettingsDlg : public StaticDialog`
`8`	`8`	`{`
`9`	`9`	`public:`
`10`		`- SettingsDlg(HINSTANCE hIntance, HWND hParent, int nCmdId, const std::wstring &configPath, std::shared_ptr<Setting> &pSetting);`
	`10`	`+ SettingsDlg(HINSTANCE hInstance, HWND hParent, int nCmdId, const std::wstring &configPath, std::shared_ptr<Setting> &pSetting);`
`11`	`11`	`~SettingsDlg() = default;`
`12`	`12`
`13`	`13`	`bool ShowDlg(bool bShow);`
Original file line number	Diff line number	Diff line change
`@@ -109,15 +109,15 @@ bool TreeViewCtrl::IsThisOrAnyChildCollapsed(HTREEITEM node) const`
`109`	`109`
`110`	`110`	`void TreeViewCtrl::Expand(HTREEITEM node) const`
`111`	`111`	`{`
`112`		`- ExpandOrCollpase(node, TVE_EXPAND);`
	`112`	`+ ExpandOrCollapse(node, TVE_EXPAND);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`void TreeViewCtrl::Collapse(HTREEITEM node) const`
`116`	`116`	`{`
`117`		`- ExpandOrCollpase(node, TVE_COLLAPSE);`
	`117`	`+ ExpandOrCollapse(node, TVE_COLLAPSE);`
`118`	`118`	`}`
`119`	`119`
`120`		`-void TreeViewCtrl::ExpandOrCollpase(HTREEITEM node, UINT_PTR code) const`
	`120`	`+void TreeViewCtrl::ExpandOrCollapse(HTREEITEM node, UINT_PTR code) const`
`121`	`121`	`{`
`122`	`122`	`TreeView_Expand(m_hTree, node, code);`
`123`	`123`	`}`
`@@ -235,7 +235,7 @@ auto TreeViewCtrl::GetNodePath(HTREEITEM hti) const -> std::wstring`
`235`	`235`
`236`	`236`	`if (!nodeKey.empty())`
`237`	`237`	`{`
`238`		`- // remove " from the beinging and end`
	`238`	`+ // remove " from the beginning and end`
`239`	`239`	`if (nodeKey[0] == TEXT('"'))`
`240`	`240`	`nodeKey.erase(0, 1);`
`241`	`241`	`if (nodeKey[nodeKey.size() - 1] == TEXT('"'))`
`@@ -262,7 +262,7 @@ auto TreeViewCtrl::GetNodePath(HTREEITEM hti) const -> std::wstring`
`262`	`262`	`hitTravel = htiParent;`
`263`	`263`	`}`
`264`	`264`
`265`		`- // remove trailling dot (.)`
	`265`	`+ // remove trailing dot (.)`
`266`	`266`	`wstrJsonPath.pop_back();`
`267`	`267`
`268`	`268`	`return wstrJsonPath;`
`@@ -295,7 +295,7 @@ HTREEITEM TreeViewCtrl::GetParentItem(HTREEITEM hti) const`
`295`	`295`
`296`	`296`	`/*`
`297`	`297`	`* Get next item of current item on the TreeView.`
`298`		`- * If current item has a child (or chidren) item, next will be the first child item.`
	`298`	`+ * If current item has a child (or children) item, next will be the first child item.`
`299`	`299`	`* If current item has no child, next will be its sibling item.`
`300`	`300`	`* If current item has no child and no sibling, next will be its parent's (parent's parent's ...) sibling item.`
`301`	`301`	`* If current item's parent is ROOT and has no sibling item, it will return NULL.`
Original file line number	Diff line number	Diff line change
`@@ -220,14 +220,14 @@ bool CUtility::OpenFileDlg(std::wstring &filePath, const std::wstring &dlgTitle,`
`220`	`220`
`221`	`221`	`if (::GetOpenFileName(&ofn) != FALSE)`
`222`	`222`	`{`
`223`		`- filePath = ofn.lpstrFile; // will have the full pathand file name.`
	`223`	`+ filePath = ofn.lpstrFile; // will have the full path and file name.`
`224`	`224`	`bRetVal = true;`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`return bRetVal;`
`228`	`228`	`}`
`229`	`229`
`230`		`-bool CUtility::CopyToClipboard(const std::wstring &str2cpy, HWND hwnd)`
	`230`	`+bool CUtility::CopyToClipboard(const std::wstring &str2cpy, HWND hWnd)`
`231`	`231`	`{`
`232`	`232`	`size_t len2Allocate = (str2cpy.size() + 1) * sizeof(TCHAR);`
`233`	`233`	`HGLOBAL hglbCopy = ::GlobalAlloc(GMEM_MOVEABLE, len2Allocate);`
`@@ -236,7 +236,7 @@ bool CUtility::CopyToClipboard(const std::wstring &str2cpy, HWND hwnd)`
`236`	`236`	`return false;`
`237`	`237`	`}`
`238`	`238`
`239`		`- if (!::OpenClipboard(hwnd))`
	`239`	`+ if (!::OpenClipboard(hWnd))`
`240`	`240`	`{`
`241`	`241`	`::GlobalFree(hglbCopy);`
`242`	`242`	`::CloseClipboard();`