Merge branch 'master' into src_MakeResourceAlignedWithVS

Author: kapilratnani

NppJSONViewer/DockingDlgInterface.h

@@ -17,8 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef DOCKINGDLGINTERFACE_H
-#define DOCKINGDLGINTERFACE_H
+#pragma once
 
 #include "StaticDialog.h"
 #include "dockingResource.h"
@@ -29,95 +28,93 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 class DockingDlgInterface : public StaticDialog
 {
 public:
-	DockingDlgInterface(): StaticDialog() {};
-	DockingDlgInterface(int dlgID): StaticDialog(), _dlgID(dlgID) {};
-	
+	DockingDlgInterface() : StaticDialog() {};
+	DockingDlgInterface(int dlgID) : StaticDialog(), _dlgID(dlgID) {};
+
 	virtual void init(HINSTANCE hInst, HWND parent)
 	{
 		StaticDialog::init(hInst, parent);
 		::GetModuleFileName((HMODULE)hInst, _moduleName, MAX_PATH);
 		lstrcpy(_moduleName, PathFindFileName(_moduleName));
 	}
 
-    void create(tTbData * data, bool isRTL = false){
+	void create(tTbData * data, bool isRTL = false)
+	{
 		StaticDialog::create(_dlgID, isRTL);
 		::GetWindowText(_hSelf, _pluginName, sizeof(_pluginName));
 
-        // user information
-		data->hClient		= _hSelf;
-		data->pszName		= _pluginName;
+		// user information
+		data->hClient = _hSelf;
+		data->pszName = _pluginName;
 
 		// supported features by plugin
-		data->uMask			= 0;
+		data->uMask = 0;
 
 		// additional info
-		data->pszAddInfo	= NULL;
+		data->pszAddInfo = NULL;
 		_data = data;
 
-	};
+	}
 
-	virtual void updateDockingDlg(void) {
+	virtual void updateDockingDlg(void)
+	{
 		::SendMessage(_hParent, NPPM_DMMUPDATEDISPINFO, 0, (LPARAM)_hSelf);
 	}
 
-    virtual void destroy() {
-    };
+	virtual void destroy() {}
 
-	virtual void display(bool toShow = true) const {
-		::SendMessage(_hParent, toShow?NPPM_DMMSHOW:NPPM_DMMHIDE, 0, (LPARAM)_hSelf);
-	};
+	virtual void display(bool toShow = true) const
+	{
+		::SendMessage(_hParent, toShow ? NPPM_DMMSHOW : NPPM_DMMHIDE, 0, (LPARAM)_hSelf);
+	}
 
-	const TCHAR * getPluginFileName() const {
-		return _moduleName;
-	};
+	const TCHAR * getPluginFileName() const { return _moduleName; }
 
-protected :
+protected:
 	virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM /*wParam*/, LPARAM lParam)
 	{
-		switch (message) 
+		switch (message)
 		{
 
-			case WM_NOTIFY: 
-			{
-				LPNMHDR	pnmh	= (LPNMHDR)lParam;
+		case WM_NOTIFY:
+		{
+			LPNMHDR	pnmh = (LPNMHDR)lParam;
 
-				if (pnmh->hwndFrom == _hParent)
+			if (pnmh->hwndFrom == _hParent)
+			{
+				switch (LOWORD(pnmh->code))
+				{
+				case DMN_CLOSE:
+				{
+					break;
+				}
+				case DMN_FLOAT:
+				{
+					_isFloating = true;
+					break;
+				}
+				case DMN_DOCK:
 				{
-					switch (LOWORD(pnmh->code))
-					{
-						case DMN_CLOSE:
-						{
-							break;
-						}
-						case DMN_FLOAT:
-						{
-							_isFloating = true;
-							break;
-						}
-						case DMN_DOCK:
-						{
-							_isFloating = false;
-							break;
-						}
-						default:
-							break;
-					}
+					_isFloating = false;
+					break;
+				}
+				default:
+					break;
 				}
-				break;
 			}
-			default:
-				break;
+			break;
+		}
+		default:
+			break;
 		}
 		return FALSE;
 	};
-	
+
 	// Handles
-    HWND			_HSource;
-	tTbData*		_data;
-	int				_dlgID;
-	bool            _isFloating;
-	TCHAR            _moduleName[MAX_PATH];
-	TCHAR			_pluginName[MAX_PATH];
+	HWND			_HSource = nullptr;
+	tTbData*		_data = nullptr;
+	int				_dlgID = 0;
+	bool            _isFloating = false;
+	TCHAR            _moduleName[MAX_PATH] = {};
+	TCHAR			_pluginName[MAX_PATH] = {};
 };
-
-#endif // DOCKINGDLGINTERFACE_H

NppJSONViewer/JSONDialog.cpp

@@ -61,12 +61,12 @@ HTREEITEM JSONDialog::insertToTree(HWND hWndDlg,HTREEITEM parent, const char *te
 	tvinsert.hInsertAfter=TVI_LAST;
 	tvinsert.item.mask=TVIF_TEXT;
 
-	int len = strlen(text) + 1;
+	auto len = strlen(text) + 1;
 	wchar_t *w_msg = new wchar_t[len];
 	if (w_msg)
 	{
 		memset(w_msg, 0, len);
-		MultiByteToWideChar(CP_UTF8, NULL, text, -1, w_msg, len);
+		MultiByteToWideChar(CP_UTF8, NULL, text, -1, w_msg, static_cast<int>(len));
 
 		tvinsert.item.pszText = w_msg;
 		item = (HTREEITEM)SendDlgItemMessage(hWndDlg, IDC_TREE, TVM_INSERTITEM, 0, (LPARAM)&tvinsert);
@@ -88,14 +88,16 @@ void JSONDialog::setJSON(char* json)
 		drawTreeSaxParse();
 }
 
-void JSONDialog::populateTreeUsingSax(HWND hWndDlg, HTREEITEM tree_root, char *json) {
+void JSONDialog::populateTreeUsingSax(HWND /*hWndDlg*/, HTREEITEM tree_root, char *json)
+{
 	//Stopwatch sw;
 	//sw.Start();
 	TreeBuilder handler(this, tree_root);
 	rapidjson::Reader reader;
 
 	rapidjson::StringStream ss(json);
-	if (!reader.Parse<rapidjson::kParseNumbersAsStringsFlag>(ss, handler)) {
+	if (!reader.Parse<rapidjson::kParseNumbersAsStringsFlag>(ss, handler)) 
+	{
 		::MessageBox(nppData._nppHandle, TEXT("Could not parse!!"), TEXT("JSON Viewer"), MB_OK | MB_ICONERROR);
 
 		//mark the error position
@@ -341,7 +343,8 @@ void JSONDialog::drawTreeSaxParse()
 	HTREEITEM tree_root;
 	tree_root = initTree(this->getHSelf());
 
-	if (strlen(curJSON) == 0) {
+	if (strlen(curJSON) == 0) 
+	{
 		insertToTree(this->getHSelf(), tree_root, "Error:Please select a JSON String.");
 		TreeView_Expand(GetDlgItem(this->getHSelf(), IDC_TREE), tree_root, TVE_EXPAND);
 		return;

NppJSONViewer/JSONDialog.h

@@ -1,58 +1,57 @@
-/*
-This file is part of JSONViewer Plugin for Notepad++
-Copyright (C)2011 Kapil Ratnani <kapil.ratnani@iiitb.net>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-#ifndef JSONDIALOG_H
-#define JSONDIALOG_H
-
-#include "DockingDlgInterface.h"
-#include "PluginInterface.h"
-#include <commctrl.h>
-#include "resource.h"
-#include "json.h"
-
-class JSONDialog : public DockingDlgInterface
-{
-	char *curJSON;
-	HANDLE hTree;
-	//void drawTree();
-	void drawTreeSaxParse();
-	HTREEITEM initTree(HWND hWndDlg);
-	HTREEITEM insertToTree(HWND hWndDlg,HTREEITEM parent,const char *text);
-	//void populateTree (HWND hWndDlg, HTREEITEM tree_root, json_t * json_root, int level);
-	void populateTreeUsingSax(HWND hWndDlg, HTREEITEM tree_root, char * json);
-public :
-	JSONDialog() : DockingDlgInterface(IDD_TREEDLG){};
-
-	HTREEITEM insertToTree(HTREEITEM parent, const char *text);
-
-    virtual void display(bool toShow = true) const {
-        DockingDlgInterface::display(toShow);
-    };
-
-	void setParent(HWND parent2set){
-		_hParent = parent2set;
-	};
-
-	void setJSON(char *json);
-
-protected :
-	virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
-};
-
-#endif //JSONDIALOG_H
+/*
+This file is part of JSONViewer Plugin for Notepad++
+Copyright (C)2011 Kapil Ratnani <kapil.ratnani@iiitb.net>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#pragma once
+
+#include "DockingDlgInterface.h"
+#include "PluginInterface.h"
+#include <commctrl.h>
+#include "resource.h"
+#include "json.h"
+
+class JSONDialog : public DockingDlgInterface
+{
+	char *curJSON = nullptr;
+	HANDLE hTree = nullptr;
+	//void drawTree();
+	void drawTreeSaxParse();
+	HTREEITEM initTree(HWND hWndDlg);
+	HTREEITEM insertToTree(HWND hWndDlg, HTREEITEM parent, const char *text);
+	//void populateTree (HWND hWndDlg, HTREEITEM tree_root, json_t * json_root, int level);
+	void populateTreeUsingSax(HWND hWndDlg, HTREEITEM tree_root, char * json);
+  public :
+	JSONDialog() : DockingDlgInterface(IDD_TREEDLG){};
+
+	HTREEITEM insertToTree(HTREEITEM parent, const char *text);
+
+	virtual void display(bool toShow = true) const
+	{
+		DockingDlgInterface::display(toShow);
+	}
+
+	void setParent(HWND parent2set)
+	{
+		_hParent = parent2set;
+	}
+
+	void setJSON(char *json);
+
+protected:
+	virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
+};

NppJSONViewer/NPPJSONViewer.vcxproj

@@ -98,6 +98,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <SDLCheck>true</SDLCheck>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -116,6 +117,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <SDLCheck>true</SDLCheck>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -136,6 +138,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <SDLCheck>true</SDLCheck>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -159,6 +162,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <SDLCheck>true</SDLCheck>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

NppJSONViewer/PluginDefinition.cpp

@@ -242,7 +242,7 @@ void formatSelectedJSON() {
 	rapidjson::StringBuffer sb;
 	rapidjson::PrettyWriter<rapidjson::StringBuffer> pw(sb);
 	bool useTabs = ::SendMessage(curScintilla, SCI_GETUSETABS, 0, 0);
-	int indentLen = useTabs ? 1 : ::SendMessage(curScintilla, SCI_GETTABWIDTH, 0, 0);
+	unsigned indentLen = useTabs ? 1 : static_cast<unsigned>(::SendMessage(curScintilla, SCI_GETTABWIDTH, 0, 0));
 	char indentChar = useTabs ? '\t' : ' ';
 	pw.SetIndent(indentChar, indentLen);
 	rapidjson::StringStream ss(curJSON);

NppJSONViewer/StaticDialog.cpp

@@ -80,7 +80,7 @@ void StaticDialog::create(int dialogID, bool isRTL)
 	{
 		DWORD err = ::GetLastError();
 		char errMsg[256];
-		sprintf(errMsg, "CreateDialogParam() return NULL.\rGetLastError() == %u", err);
+		sprintf(errMsg, "CreateDialogParam() return NULL.\rGetLastError() == %lu", err);
 		::MessageBoxA(NULL, errMsg, "In StaticDialog::create()", MB_OK);
 		return;
 	}