[LINT] error 1411

joce · joce · commit 4763ae81d2d4 · 2010-11-22T23:51:10.000-07:00
Member with different signature hides virtual member 'Symbol' (Location)

Signed-off-by: Jocelyn Legault &lt;jocelynlegault@gmail.com&gt;
diff --git a/PythonScript/src/AboutDialog.h b/PythonScript/src/AboutDialog.h
@@ -13,7 +13,7 @@ class AboutDialog : public StaticDialog
 	AboutDialog(void);
 	~AboutDialog(void);
 	
-	void init(HINSTANCE hInst, NppData& nppData);
+	void initDialog(HINSTANCE hInst, NppData& nppData);
 
 	void doDialog();
 
diff --git a/PythonScript/src/AboutDialog2.cpp b/PythonScript/src/AboutDialog2.cpp
@@ -79,7 +79,7 @@ BOOL CALLBACK AboutDialog::run_dlgProc(HWND hWnd, UINT Message, WPARAM wParam, L
 
 }
 
-void AboutDialog::init( HINSTANCE hInst, NppData& nppData )
+void AboutDialog::initDialog( HINSTANCE hInst, NppData& nppData )
 {
 	Window::init(hInst, nppData._nppHandle);
 }
diff --git a/PythonScript/src/ConsoleDialog.cpp b/PythonScript/src/ConsoleDialog.cpp
@@ -39,7 +39,7 @@ ConsoleDialog::~ConsoleDialog()
 }
 
 
-void ConsoleDialog::init(HINSTANCE hInst, NppData& nppData, ConsoleInterface* console)
+void ConsoleDialog::initDialog(HINSTANCE hInst, NppData& nppData, ConsoleInterface* console)
 {
     DockingDlgInterface::init(hInst, nppData._nppHandle);
     
diff --git a/PythonScript/src/ConsoleDialog.h b/PythonScript/src/ConsoleDialog.h
@@ -19,7 +19,7 @@ class ConsoleDialog : public DockingDlgInterface
 	~ConsoleDialog();
 
 	
-	void init(HINSTANCE hInst, NppData& nppData, ConsoleInterface *console);
+	void initDialog(HINSTANCE hInst, NppData& nppData, ConsoleInterface *console);
 
     void doDialog();
 	void hide();
diff --git a/PythonScript/src/PythonConsole.cpp b/PythonScript/src/PythonConsole.cpp
@@ -43,7 +43,7 @@ PythonConsole::~PythonConsole()
 
 void PythonConsole::init(HINSTANCE hInst, NppData& nppData)
 {
-	mp_consoleDlg->init(hInst, nppData, this);
+	mp_consoleDlg->initDialog(hInst, nppData, this);
 	*m_nppData = nppData;
 	mp_scintillaWrapper->setHandle(mp_consoleDlg->getScintillaHwnd());
 }
diff --git a/PythonScript/src/PythonScript.cpp b/PythonScript/src/PythonScript.cpp
@@ -222,7 +222,7 @@ void initialise()
 
 	pythonHandler = new PythonHandler(g_pluginDir, g_configDir, (HINSTANCE)g_hModule, nppData._nppHandle, nppData._scintillaMainHandle, nppData._scintillaSecondHandle, g_console);
 	
-	aboutDlg.init((HINSTANCE)g_hModule, nppData);
+	aboutDlg.initDialog((HINSTANCE)g_hModule, nppData);
 	
 	g_shortcutDlg = new ShortcutDlg((HINSTANCE)g_hModule, nppData, _T("\\PythonScript\\scripts"));
 
diff --git a/PythonScript/src/ScintillaWrapper.h b/PythonScript/src/ScintillaWrapper.h
@@ -19,7 +19,7 @@ struct SCNotification;
 
 struct out_of_bounds_exception : public std::exception
 {
-	char const* what() throw() { return "Out of bounds exception"; }
+	char const* what() const throw() { return "Out of bounds exception"; }
 };
 namespace PythonScript
 {

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ BOOL CALLBACK AboutDialog::run_dlgProc(HWND hWnd, UINT Message, WPARAM wParam, L`
`79`	`79`
`80`	`80`	`}`
`81`	`81`
`82`		`-void AboutDialog::init( HINSTANCE hInst, NppData& nppData )`
	`82`	`+void AboutDialog::initDialog( HINSTANCE hInst, NppData& nppData )`
`83`	`83`	`{`
`84`	`84`	`Window::init(hInst, nppData._nppHandle);`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ ConsoleDialog::~ConsoleDialog()`
`39`	`39`	`}`
`40`	`40`
`41`	`41`
`42`		`-void ConsoleDialog::init(HINSTANCE hInst, NppData& nppData, ConsoleInterface* console)`
	`42`	`+void ConsoleDialog::initDialog(HINSTANCE hInst, NppData& nppData, ConsoleInterface* console)`
`43`	`43`	`{`
`44`	`44`	`DockingDlgInterface::init(hInst, nppData._nppHandle);`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ PythonConsole::~PythonConsole()`
`43`	`43`
`44`	`44`	`void PythonConsole::init(HINSTANCE hInst, NppData& nppData)`
`45`	`45`	`{`
`46`		`- mp_consoleDlg->init(hInst, nppData, this);`
	`46`	`+ mp_consoleDlg->initDialog(hInst, nppData, this);`
`47`	`47`	`*m_nppData = nppData;`
`48`	`48`	`mp_scintillaWrapper->setHandle(mp_consoleDlg->getScintillaHwnd());`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ struct SCNotification;`
`19`	`19`
`20`	`20`	`struct out_of_bounds_exception : public std::exception`
`21`	`21`	`{`
`22`		`- char const* what() throw() { return "Out of bounds exception"; }`
	`22`	`+ char const* what() const throw() { return "Out of bounds exception"; }`
`23`	`23`	`};`
`24`	`24`	`namespace PythonScript`
`25`	`25`	`{`