Skip to content

Commit d320405

Browse files
committed
Fix some typo
1 parent 4a84e3c commit d320405

File tree

6 files changed

+26
-19
lines changed

6 files changed

+26
-19
lines changed

src/NppJsonViewer/JsonHandler.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
#include <rapidjson/reader.h>
66
#include <rapidjson/writer.h>
7-
#include "rapidjson/document.h"
7+
#include <rapidjson/document.h>
88
#include <rapidjson/prettywriter.h>
99
#include <rapidjson/stringbuffer.h>
1010
#include <rapidjson/error/en.h>
11+
1112
#include "Define.h"
1213

1314
namespace rj = rapidjson;

src/NppJsonViewer/JsonViewDlg.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
#pragma once
2+
3+
#include <string>
4+
#include <memory>
5+
#include <vector>
6+
#include <optional>
7+
28
#include "DockingDlgInterface.h"
39
#include "PluginInterface.h"
410
#include "resource.h"
511
#include "TreeViewCtrl.h"
612
#include "ScintillaEditor.h"
713
#include "JsonHandler.h"
8-
#include <string>
9-
#include <memory>
10-
#include <vector>
11-
#include <optional>
14+
1215

1316
class JsonViewDlg : public DockingDlgInterface
1417
{

src/NppJsonViewer/Profile.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,24 @@ bool Profile::WriteValue(const std::wstring &section, const std::wstring &key, c
4949

5050
void Profile::Init()
5151
{
52-
auto appDatapath = CUtility::GetSpecialFolderLocation(CSIDL_APPDATA);
53-
if (appDatapath.empty())
52+
auto appDataPath = CUtility::GetSpecialFolderLocation(CSIDL_APPDATA);
53+
if (appDataPath.empty())
5454
{
5555
::MessageBox(NULL, L"Failed to get %appdata% path. Please contact developer. Inconvenience regretted.", JSON_ERROR_TITLE, MB_OK | MB_ICONERROR);
5656
return;
5757
}
5858

59-
appDatapath += L"\\config";
60-
if (!CUtility::DirExist(appDatapath) && !CUtility::CreateDir(appDatapath))
59+
appDataPath += L"\\config";
60+
if (!CUtility::DirExist(appDataPath) && !CUtility::CreateDir(appDataPath))
6161
{
6262
std::wstring msg = L"Failed to get below directory. Please contact developer. Inconvenience regretted.";
63-
msg += L"\n\n" + appDatapath;
63+
msg += L"\n\n" + appDataPath;
6464

6565
::MessageBox(NULL, msg.c_str(), JSON_ERROR_TITLE, MB_OK | MB_ICONERROR);
6666
return;
6767
}
6868

69-
m_ProfileFilePath = appDatapath + L"\\" + PLUGIN_CONFIG;
69+
m_ProfileFilePath = appDataPath + L"\\" + PLUGIN_CONFIG;
7070
}
7171

7272
bool ProfileSetting::GetSettings(Setting &info) const

src/NppJsonViewer/RapidJsonHandler.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
#pragma once
22

3-
#include "JsonNode.h"
4-
53
#include <stack>
4+
#include <memory>
65
#include <Windows.h>
76
#include <commctrl.h>
7+
88
#include <rapidjson/reader.h>
99

10+
#include "JsonNode.h"
11+
12+
1013
class JsonViewDlg;
1114

1215
struct TreeNode

src/NppJsonViewer/dllmain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID /*lpRese
2525

2626
// Below are the mandatory function to be implemented as Notepad++ requires them
2727

28-
extern "C" __declspec(dllexport) void setInfo(NppData notpadPlusData)
28+
extern "C" __declspec(dllexport) void setInfo(NppData notepadPlusData)
2929
{
30-
g_NppJsonPlugin.SetInfo(notpadPlusData);
30+
g_NppJsonPlugin.SetInfo(notepadPlusData);
3131
}
3232

3333
extern "C" __declspec(dllexport) const TCHAR *getName()

src/UtilityLib/StringHelper.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ std::vector<std::wstring> StringHelper::Split(const std::wstring &input, const s
9999
return tokens;
100100
}
101101

102-
bool StringHelper::Contains(const std::string &input, const std::string &search, bool ignorecase)
102+
bool StringHelper::Contains(const std::string &input, const std::string &search, bool ignoreCase)
103103
{
104-
return Contains(ToWstring(input), ToWstring(search), ignorecase);
104+
return Contains(ToWstring(input), ToWstring(search), ignoreCase);
105105
}
106106

107-
bool StringHelper::Contains(const std::wstring &input, const std::wstring &search, bool ignorecase)
107+
bool StringHelper::Contains(const std::wstring &input, const std::wstring &search, bool ignoreCase)
108108
{
109109
std::wstring lower_input = input;
110110
std::wstring lower_search = search;
111-
if (ignorecase)
111+
if (ignoreCase)
112112
{
113113
ToLower(lower_input);
114114
ToLower(lower_search);

0 commit comments

Comments
 (0)