Some minor cleaning up.

opencor · Oct 24, 2019 · 665da91 · 665da91
1 parent afb62d7
commit 665da91
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/src/plugins/miscellaneous/PythonConsoleWindow/src/pythonconsolewindow.h b/src/plugins/miscellaneous/PythonConsoleWindow/src/pythonconsolewindow.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 namespace Ui {
     class PythonConsoleWindow;
-}
+}   // namespace Ui
 
 //==============================================================================
 
@@ -51,7 +51,7 @@ Q_OBJECT
 
 public:
     explicit PythonConsoleWindow(QWidget *pParent);
-    ~PythonConsoleWindow();
+    ~PythonConsoleWindow() override;
 
 private:
     Ui::PythonConsoleWindow *mGui;

diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.cpp b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.cpp
@@ -203,7 +203,7 @@ void WebBrowserWindowPlugin::registerPythonClasses(PyObject *pModule)
 // Plugin specific
 //==============================================================================
 
-WebBrowserWindowPlugin * WebBrowserWindowPlugin::instance(void)
+WebBrowserWindowPlugin * WebBrowserWindowPlugin::instance()
 {
     // Return the 'global' instance of our plugin
 
@@ -216,7 +216,7 @@ WebBrowserWindowPlugin * WebBrowserWindowPlugin::instance(void)
 
 //==============================================================================
 
-WebBrowserWindowWidget * WebBrowserWindowPlugin::browserWidget(void) const
+WebBrowserWindowWidget * WebBrowserWindowPlugin::browserWidget() const
 {
     // Return our Web Browser widget
 

diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.h b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.h
@@ -71,10 +71,10 @@ class WebBrowserWindowPlugin : public QObject, public I18nInterface,
     WebBrowserWindowWidget * browserWidget() const;
 
 private:
-    QAction *mWebBrowserWindowAction;
+    QAction *mWebBrowserWindowAction = nullptr;
 
-    WebBrowserWindowWidget *mWebBrowserWindowWidget;
-    WebBrowserWindowWindow *mWebBrowserWindowWindow;
+    WebBrowserWindowWidget *mWebBrowserWindowWidget = nullptr;
+    WebBrowserWindowWindow *mWebBrowserWindowWindow = nullptr;
 };
 
 //==============================================================================

diff --git a/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewplugin.h b/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewplugin.h
@@ -80,7 +80,7 @@ class SimulationExperimentViewPlugin : public QObject,
     SimulationExperimentViewWidget * viewWidget() const;
 
 private:
-    SimulationExperimentViewWidget *mViewWidget;
+    SimulationExperimentViewWidget *mViewWidget = nullptr;
 };
 
 //==============================================================================

diff --git a/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewpythonwrapper.h b/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewpythonwrapper.h
@@ -48,7 +48,8 @@ class SimulationExperimentViewPythonWrapper : public QObject
     Q_OBJECT
 
 public:
-    explicit SimulationExperimentViewPythonWrapper(PyObject *pModule, QObject *pParent=0);
+    explicit SimulationExperimentViewPythonWrapper(PyObject *pModule,
+                                                   QObject *pParent = nullptr);
 };
 
 //==============================================================================

diff --git a/src/plugins/support/SimulationSupport/src/simulationsupportpythonwrapper.h b/src/plugins/support/SimulationSupport/src/simulationsupportpythonwrapper.h
@@ -42,7 +42,7 @@ namespace OpenCOR {
 
 namespace DataStore {
     class DataStoreVariable;
-}
+}   // namespace DataStore
 
 //==============================================================================
 
@@ -60,17 +60,11 @@ class SimulationResults;
 // to create a function object to be called when simulation parameters are updated
 
 #if defined(_MSC_VER)
-    #if _MSC_VER > 1900
-        // Visual Studio 2017
-        typedef std::_Binder<std::_Unforced, void (*)(SimulationData *), SimulationData *> SimulationDataUpdatedFunction;
-    #else
-        // Visual Studio 2015
-        typedef std::_Binder<std::_Unforced, void (*)(SimulationData *), SimulationData * const> SimulationDataUpdatedFunction;
-    #endif
+    using SimulationDataUpdatedFunction = std::_Binder<std::_Unforced, void (*)(SimulationData *), SimulationData *>;
 #elif defined(__APPLE__)
-    typedef std::__bind<void (*)(SimulationData *), SimulationData *> SimulationDataUpdatedFunction;
+    using SimulationDataUpdatedFunction = std::__bind<void (*)(SimulationData *), SimulationData *>;
 #else
-    typedef std::_Bind_helper<false, void (*)(SimulationData *), SimulationData *>::type SimulationDataUpdatedFunction;
+    using SimulationDataUpdatedFunction = std::_Bind_helper<false, void (*)(SimulationData *), SimulationData *>::type;
 #endif
 
 //==============================================================================
@@ -131,7 +125,7 @@ public slots:
 
     // Access a simulation's sensitivity gradients
 
-    PyObject * gradients(OpenCOR::SimulationSupport::SimulationResults *pSimulationData) const;
+    PyObject * gradients(OpenCOR::SimulationSupport::SimulationResults *pSimulationResults) const;
 
 private slots:
     void error(const QString &pErrorMessage);