Skip to content

Commit 7037fe4

Browse files
committed
Update Submodule path
1 parent 416ea8c commit 7037fe4

25 files changed

+68
-67
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
[submodule "external/googletest"]
55
path = external/googletest
66
url = https://github.com/google/googletest.git
7-
[submodule "external/plugintemplate"]
8-
path = external/plugintemplate
7+
[submodule "external/npp_plugintemplate"]
8+
path = external/npp_plugintemplate
99
url = https://github.com/npp-plugins/plugintemplate

src/NppJsonViewer/NPPJSONViewer.vcxproj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
<ClCompile Include="ShortcutCommand.cpp" />
199199
<ClCompile Include="SliderCtrl.cpp" />
200200
<ClCompile Include="TreeViewCtrl.cpp" />
201-
<ClCompile Include="plugintemplate\DockingFeature\StaticDialog.cpp" />
201+
<ClCompile Include="npp_include\DockingFeature\StaticDialog.cpp" />
202202
</ItemGroup>
203203
<ItemGroup>
204204
<ClInclude Include="AboutDlg.h" />
@@ -207,6 +207,7 @@
207207
<ClInclude Include="JsonNode.h" />
208208
<ClInclude Include="JsonViewDlg.h" />
209209
<ClInclude Include="NppJsonPlugin.h" />
210+
<ClInclude Include="npp_include\Sci_Position.h" />
210211
<ClInclude Include="Profile.h" />
211212
<ClInclude Include="RapidJsonHandler.h" />
212213
<ClInclude Include="resource.h" />
@@ -218,15 +219,15 @@
218219
<ClInclude Include="TrackingStream.h" />
219220
<ClInclude Include="TreeHandler.h" />
220221
<ClInclude Include="TreeViewCtrl.h" />
221-
<ClInclude Include="plugintemplate\DockingFeature\Docking.h" />
222-
<ClInclude Include="plugintemplate\DockingFeature\DockingDlgInterface.h" />
223-
<ClInclude Include="plugintemplate\DockingFeature\dockingResource.h" />
224-
<ClInclude Include="plugintemplate\DockingFeature\StaticDialog.h" />
225-
<ClInclude Include="plugintemplate\DockingFeature\Window.h" />
226-
<ClInclude Include="plugintemplate\menuCmdID.h" />
227-
<ClInclude Include="plugintemplate\Notepad_plus_msgs.h" />
228-
<ClInclude Include="plugintemplate\PluginInterface.h" />
229-
<ClInclude Include="plugintemplate\Scintilla.h" />
222+
<ClInclude Include="npp_include\DockingFeature\Docking.h" />
223+
<ClInclude Include="npp_include\DockingFeature\DockingDlgInterface.h" />
224+
<ClInclude Include="npp_include\DockingFeature\dockingResource.h" />
225+
<ClInclude Include="npp_include\DockingFeature\StaticDialog.h" />
226+
<ClInclude Include="npp_include\DockingFeature\Window.h" />
227+
<ClInclude Include="npp_include\menuCmdID.h" />
228+
<ClInclude Include="npp_include\Notepad_plus_msgs.h" />
229+
<ClInclude Include="npp_include\PluginInterface.h" />
230+
<ClInclude Include="npp_include\Scintilla.h" />
230231
</ItemGroup>
231232
<ItemGroup>
232233
<ResourceCompile Include="resource.rc" />

src/NppJsonViewer/NPPJSONViewer.vcxproj.filters

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<Filter Include="ThirdParty">
1717
<UniqueIdentifier>{3a31aa3c-9f15-4a33-bf5c-b9153d1e757a}</UniqueIdentifier>
1818
</Filter>
19-
<Filter Include="ThirdParty\plugintemplate">
19+
<Filter Include="ThirdParty\npp_include">
2020
<UniqueIdentifier>{5b794f9e-baf6-4faf-98a6-741b4918d410}</UniqueIdentifier>
2121
</Filter>
22-
<Filter Include="ThirdParty\plugintemplate\DockingFeature">
22+
<Filter Include="ThirdParty\npp_include\DockingFeature">
2323
<UniqueIdentifier>{072ab05e-efec-4d68-9a86-dbdf2bdaec4d}</UniqueIdentifier>
2424
</Filter>
2525
</ItemGroup>
@@ -60,8 +60,8 @@
6060
<ClCompile Include="TreeViewCtrl.cpp">
6161
<Filter>Source Files</Filter>
6262
</ClCompile>
63-
<ClCompile Include="plugintemplate\DockingFeature\StaticDialog.cpp">
64-
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
63+
<ClCompile Include="npp_include\DockingFeature\StaticDialog.cpp">
64+
<Filter>Source Files</Filter>
6565
</ClCompile>
6666
</ItemGroup>
6767
<ItemGroup>
@@ -116,35 +116,35 @@
116116
<ClInclude Include="TreeViewCtrl.h">
117117
<Filter>Header Files</Filter>
118118
</ClInclude>
119-
<ClInclude Include="plugintemplate\DockingFeature\Docking.h">
120-
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
119+
<ClInclude Include="npp_include\DockingFeature\Docking.h">
120+
<Filter>ThirdParty\npp_include\DockingFeature</Filter>
121121
</ClInclude>
122-
<ClInclude Include="plugintemplate\DockingFeature\DockingDlgInterface.h">
123-
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
122+
<ClInclude Include="npp_include\DockingFeature\DockingDlgInterface.h">
123+
<Filter>ThirdParty\npp_include\DockingFeature</Filter>
124124
</ClInclude>
125-
<ClInclude Include="plugintemplate\DockingFeature\dockingResource.h">
126-
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
125+
<ClInclude Include="npp_include\DockingFeature\dockingResource.h">
126+
<Filter>ThirdParty\npp_include\DockingFeature</Filter>
127127
</ClInclude>
128-
<ClInclude Include="plugintemplate\DockingFeature\StaticDialog.h">
129-
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
128+
<ClInclude Include="npp_include\DockingFeature\StaticDialog.h">
129+
<Filter>ThirdParty\npp_include\DockingFeature</Filter>
130130
</ClInclude>
131-
<ClInclude Include="plugintemplate\DockingFeature\Window.h">
132-
<Filter>ThirdParty\plugintemplate\DockingFeature</Filter>
131+
<ClInclude Include="npp_include\DockingFeature\Window.h">
132+
<Filter>ThirdParty\npp_include\DockingFeature</Filter>
133133
</ClInclude>
134-
<ClInclude Include="plugintemplate\menuCmdID.h">
135-
<Filter>ThirdParty\plugintemplate</Filter>
134+
<ClInclude Include="npp_include\menuCmdID.h">
135+
<Filter>ThirdParty\npp_include</Filter>
136136
</ClInclude>
137-
<ClInclude Include="plugintemplate\Notepad_plus_msgs.h">
138-
<Filter>ThirdParty\plugintemplate</Filter>
137+
<ClInclude Include="npp_include\Notepad_plus_msgs.h">
138+
<Filter>ThirdParty\npp_include</Filter>
139139
</ClInclude>
140-
<ClInclude Include="plugintemplate\PluginInterface.h">
141-
<Filter>ThirdParty\plugintemplate</Filter>
140+
<ClInclude Include="npp_include\PluginInterface.h">
141+
<Filter>ThirdParty\npp_include</Filter>
142142
</ClInclude>
143-
<ClInclude Include="plugintemplate\Sci_Position.h">
144-
<Filter>ThirdParty\plugintemplate</Filter>
143+
<ClInclude Include="npp_include\Sci_Position.h">
144+
<Filter>ThirdParty\npp_include</Filter>
145145
</ClInclude>
146-
<ClInclude Include="plugintemplate\Scintilla.h">
147-
<Filter>ThirdParty\plugintemplate</Filter>
146+
<ClInclude Include="npp_include\Scintilla.h">
147+
<Filter>ThirdParty\npp_include</Filter>
148148
</ClInclude>
149149
</ItemGroup>
150150
<ItemGroup>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../../external/npp_plugintemplate/src/DockingFeature/Docking.h" // IWYU pragma: export
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../../external/npp_plugintemplate/src/DockingFeature/DockingDlgInterface.h" // IWYU pragma: export

src/NppJsonViewer/plugintemplate/DockingFeature/StaticDialog.cpp renamed to src/NppJsonViewer/npp_include/DockingFeature/StaticDialog.cpp

File renamed without changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../../external/npp_plugintemplate/src/DockingFeature/StaticDialog.h" // IWYU pragma: export
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../../external/npp_plugintemplate/src/DockingFeature/Window.h" // IWYU pragma: export
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../../external/npp_plugintemplate/src/DockingFeature/dockingResource.h" // IWYU pragma: export
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
// Forwarding header for ease of use
3+
#include "../../../external/npp_plugintemplate/src/Notepad_plus_msgs.h" // IWYU pragma: export

0 commit comments

Comments
 (0)