alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Calendar] Store plugin manager as QPointer

Browse Source 
EventPluginsManager is created externally and managed by QML. We cannot
assume the lifespan outlives our Calendar class.

BUG: 385011
This commit is contained in:
David Edmundson 2021-06-18 11:41:24 +01:00 committed by Nate Graham
parent 3e006a0c42
commit b2f821ad21
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/declarativeimports/calendar/daysmodel.h
View File

@ -9,12 +9,12 @@
#define DAYSMODEL_H #define DAYSMODEL_H
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QPointer>
#include "daydata.h" #include "daydata.h"
#include "eventpluginsmanager.h"
#include <CalendarEvents/CalendarEventsPlugin> #include <CalendarEvents/CalendarEventsPlugin>
class EventPluginsManager;
class DaysModel : public QAbstractItemModel class DaysModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT
@ -68,7 +68,7 @@ private:
bool hasMajorEventAtDate(const QDate &date) const; bool hasMajorEventAtDate(const QDate &date) const;
bool hasMinorEventAtDate(const QDate &date) const; bool hasMinorEventAtDate(const QDate &date) const;
EventPluginsManager *m_pluginsManager = nullptr; QPointer<EventPluginsManager> m_pluginsManager;
QList<DayData> *m_data = nullptr; QList<DayData> *m_data = nullptr;
QList<QObject *> m_qmlData; QList<QObject *> m_qmlData;
QDate m_lastRequestedAgendaDate; QDate m_lastRequestedAgendaDate;