From f1d1c2628313044c7bd29cfaabb65dd0acfec267 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 28 Jun 2020 03:02:50 -0400 Subject: [PATCH] CEditorApplication: Make use of in-class initializers where applicable --- src/Editor/CEditorApplication.cpp | 7 +------ src/Editor/CEditorApplication.h | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Editor/CEditorApplication.cpp b/src/Editor/CEditorApplication.cpp index b8bcee32..1cda2350 100644 --- a/src/Editor/CEditorApplication.cpp +++ b/src/Editor/CEditorApplication.cpp @@ -22,13 +22,8 @@ CEditorApplication::CEditorApplication(int& rArgc, char **ppArgv) : QApplication(rArgc, ppArgv) - , mpActiveProject(nullptr) - , mpWorldEditor(nullptr) - , mpProjectDialog(nullptr) - , mInitialized(false) + , mLastUpdate{CTimer::GlobalTime()} { - mLastUpdate = CTimer::GlobalTime(); - connect(&mRefreshTimer, SIGNAL(timeout()), this, SLOT(TickEditors())); mRefreshTimer.start(8); } diff --git a/src/Editor/CEditorApplication.h b/src/Editor/CEditorApplication.h index 6680cd6f..0a0c7bbb 100644 --- a/src/Editor/CEditorApplication.h +++ b/src/Editor/CEditorApplication.h @@ -21,12 +21,12 @@ class CEditorApplication : public QApplication Q_OBJECT std::unique_ptr mpActiveProject; - CWorldEditor *mpWorldEditor; - CResourceBrowser *mpResourceBrowser; - CProjectSettingsDialog *mpProjectDialog; + CWorldEditor *mpWorldEditor = nullptr; + CResourceBrowser *mpResourceBrowser = nullptr; + CProjectSettingsDialog *mpProjectDialog = nullptr; QVector mEditorWindows; QMap mEditingMap; - bool mInitialized; + bool mInitialized = false; QTimer mRefreshTimer; double mLastUpdate;