GUI change:

- methods OnInitDialog, OnApply & OnClose of CDlgBase now return true if successful. return of false prevents a dialog from being loaded or left respectively;
- massive code cleaning considering the 'virtual' attribute of overridden methods;
- also fixes #1476 (Don't close "Create new account" window if user not set account name)

1 files changed, 7 insertions, 6 deletions

diff --git a/protocols/Tox/src/tox_options.h b/protocols/Tox/src/tox_options.h
index 74987139da..374bfbb5af 100644
--- a/protocols/Tox/src/tox_options.h
+++ b/protocols/Tox/src/tox_options.h
@@ -28,7 +28,7 @@ private:
 	CCtrlSpin m_maxReconnectRetries;

 

 protected:

-	void OnInitDialog();

+	bool OnInitDialog() override;

 

 	void PasswordCreate_OnClick(CCtrlButton*);

 	void PasswordChange_OnClick(CCtrlButton*);

@@ -41,7 +41,7 @@ protected:
 	void ProfileImport_OnClick(CCtrlButton*);

 	void ProfileExport_OnClick(CCtrlButton*);

 

-	void OnApply();

+	bool OnApply() override;

 

 public:

 	CToxOptionsMain(CToxProto *proto, int idDialog);

@@ -75,9 +75,10 @@ private:
 	CCtrlButton m_ok;

 

 protected:

-	void OnInitDialog();

+	bool OnInitDialog() override;

+	bool OnClose() override;

+

 	void OnOk(CCtrlBase*);

-	void OnClose();

 

 public:

 	CToxNodeEditor(int iItem, CCtrlListView *m_list);

@@ -96,8 +97,8 @@ private:
 	CCtrlButton m_updateNodes;

 

 protected:

-	void OnInitDialog();

-	void OnApply();

+	bool OnInitDialog() override;

+	bool OnApply() override;

 

 	void ReloadNodeList();