Commit 3bb9e1d1 authored by Matthieu Bruel's avatar Matthieu Bruel
Browse files

Merge branch '284-bdd-erreur-ouverture-logiciel' into family_memory_loading

parents d51ccec0 494eca9a
......@@ -39,7 +39,8 @@ BuildInfo::BuildInfo(QObject *parent)
#else
m_branch(tr("Unknown commit branch"))
#endif
{}
{
}
QString BuildInfo::version() const
{
......
......@@ -28,12 +28,12 @@
Qrop::Qrop(QObject *parent)
: QObject(parent)
, m_translator(new QTranslator)
, m_buildInfo(new BuildInfo)
, m_news(new QropNews)
, m_undoStack(new QUndoStack)
, m_translator(new QTranslator(this))
, m_buildInfo(new BuildInfo(this))
, m_news(new QropNews(this))
, m_undoStack(new QUndoStack(this))
, m_isLocalDatabase(true)
, m_familySvc(new FamilyService)
, m_familySvc(new FamilyService(this))
{
}
......@@ -50,13 +50,6 @@ Qrop::~Qrop()
if (m_news->areRead())
m_settings.setValue("lastNewsUpdate", m_news->lastUpdate().toString(Qt::ISODate));
m_settings.sync();
delete m_familySvc;
delete m_undoStack;
delete m_news;
delete m_buildInfo;
delete m_translator;
qDebug() << "Qrop properly deleted!";
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment