OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Set all pointers in RiaApplication to null in constructor initialisation list

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-03-07 10:19:00 +01:00
parent 0cc1b256b2
commit 4c5ffffd60
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/Application/RiaApplication.cpp
View File

@ -179,6 +179,12 @@ bool RiaApplication::notify(QObject* receiver, QEvent* event)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaApplication::RiaApplication(int& argc, char** argv) RiaApplication::RiaApplication(int& argc, char** argv)
: QApplication(argc, argv) : QApplication(argc, argv)
, m_socketServer(nullptr)
, m_workerProcess(nullptr)
, m_preferences(nullptr)
, m_runningWorkerProcess(false)
, m_mainWindow(nullptr)
, m_mainPlotWindow(nullptr)
{ {
// USed to get registry settings in the right place // USed to get registry settings in the right place
QCoreApplication::setOrganizationName(RI_COMPANY_NAME); QCoreApplication::setOrganizationName(RI_COMPANY_NAME);
@ -209,7 +215,6 @@ RiaApplication::RiaApplication(int& argc, char** argv)
setWindowIcon(QIcon(":/AppLogo48x48.png")); setWindowIcon(QIcon(":/AppLogo48x48.png"));
m_socketServer = new RiaSocketServer(this); m_socketServer = new RiaSocketServer(this);
m_workerProcess = nullptr;
#ifdef WIN32 #ifdef WIN32
m_startupDefaultDirectory = QDir::homePath(); m_startupDefaultDirectory = QDir::homePath();
@ -223,11 +228,6 @@ RiaApplication::RiaApplication(int& argc, char** argv)
// instead of using the application font // instead of using the application font
m_standardFont = RiaFontCache::getFont(RiaFontCache::FONT_SIZE_8); m_standardFont = RiaFontCache::getFont(RiaFontCache::FONT_SIZE_8);
m_runningWorkerProcess = false;
m_mainWindow = nullptr;
m_mainPlotWindow = nullptr;
m_recentFileActionProvider = std::unique_ptr<RiuRecentFileActionProvider>(new RiuRecentFileActionProvider); m_recentFileActionProvider = std::unique_ptr<RiuRecentFileActionProvider>(new RiuRecentFileActionProvider);
// Create main windows // Create main windows