Differential D8524 Diff 23449 libtaskmanager/activityinfo.cpp

Changeset View

Standalone View

libtaskmanager/activityinfo.cpp

Show All 14 Lines
15	Lesser General Public License for more details.	15		Lesser General Public License for more details.
16		16
17	You should have received a copy of the GNU Lesser General Public	17		You should have received a copy of the GNU Lesser General Public
18	License along with this library. If not, see <http://www.gnu.org/licenses/>.	18		License along with this library. If not, see <http://www.gnu.org/licenses/>.
19	*********************************************************************/	19		*********************************************************************/
20		20
21	#include "activityinfo.h"	21		#include "activityinfo.h"
22		22
		23		#include <KActivities/ActivitiesModel>
23	#include <KActivities/Consumer>	24		#include <KActivities/Consumer>
24		25
25	namespace TaskManager	26		namespace TaskManager
26	{	27		{
27		28
28	class ActivityInfo::Private	29		class ActivityInfo::Private
29	{	30		{
30	public:	31		public:
31	Private(ActivityInfo *q);	32		Private(ActivityInfo *q);
32	~Private();	33		~Private();
33		34
34	static int instanceCount;	35		static int instanceCount;
35	static KActivities::Consumer* activityConsumer;	36		static KActivities::Consumer* activityConsumer;
		37		static KActivities::ActivitiesModel* activitiesModel;
36	};	38		};
37		39
38	int ActivityInfo::Private::instanceCount = 0;	40		int ActivityInfo::Private::instanceCount = 0;
39	KActivities::Consumer* ActivityInfo::Private::activityConsumer = nullptr;	41		KActivities::Consumer* ActivityInfo::Private::activityConsumer = nullptr;
		42		KActivities::ActivitiesModel* ActivityInfo::Private::activitiesModel = nullptr;
		43
40		44
41	ActivityInfo::Private::Private(ActivityInfo *)	45		ActivityInfo::Private::Private(ActivityInfo *)
42	{	46		{
43	++instanceCount;	47		++instanceCount;
44	}	48		}
45		49
46	ActivityInfo::Private::~Private()	50		ActivityInfo::Private::~Private()
47	{	51		{
48	--instanceCount;	52		--instanceCount;
			ivanUnsubmitted Not Done This screams `shared_ptr`, for example to a structure holding a consumer and the model. ivan: This screams `shared_ptr`, for example to a structure holding a consumer and the model.
			heinAuthorUnsubmitted Not Done I'm not going to refactor this code considerably and risk more breakage for a minor fix, especially as this pattern is used elsewhere in the lib and was reviewed as such already. hein: I'm not going to refactor this code considerably and risk more breakage for a minor fix…
49		53
50	if (!instanceCount) {	54		if (!instanceCount) {
51	delete activityConsumer;	55		delete activityConsumer;
52	activityConsumer = nullptr;	56		activityConsumer = nullptr;
		57		delete activitiesModel;
		58		activitiesModel = nullptr;
53	}	59		}
54	}	60		}
55		61
56	ActivityInfo::ActivityInfo(QObject *parent) : QObject(parent)	62		ActivityInfo::ActivityInfo(QObject *parent) : QObject(parent)
57	, d(new Private(this))	63		, d(new Private(this))
58	{	64		{
59	if (!d->activityConsumer) {	65		if (!d->activityConsumer) {
60	d->activityConsumer = new KActivities::Consumer();	66		d->activityConsumer = new KActivities::Consumer();
61	}	67		}
62		68
63	connect(d->activityConsumer, &KActivities::Consumer::currentActivityChanged,	69		connect(d->activityConsumer, &KActivities::Consumer::currentActivityChanged,
64	this, &ActivityInfo::currentActivityChanged);	70		this, &ActivityInfo::currentActivityChanged);
65	connect(d->activityConsumer, &KActivities::Consumer::runningActivitiesChanged,	71		connect(d->activityConsumer, &KActivities::Consumer::runningActivitiesChanged,
66	this, &ActivityInfo::numberOfRunningActivitiesChanged);	72		this, &ActivityInfo::numberOfRunningActivitiesChanged);
		73		connect(d->activityConsumer, &KActivities::Consumer::runningActivitiesChanged,
		74		this, &ActivityInfo::namesOfRunningActivitiesChanged);
		75
		76		if (!d->activitiesModel) {
		77		d->activitiesModel = new KActivities::ActivitiesModel();
		78		d->activitiesModel->setShownStates(QVector<KActivities::Info::State>{KActivities::Info::Running});
		79		}
		80
		81		connect(d->activitiesModel, &KActivities::ActivitiesModel::modelReset,
		82		this, &ActivityInfo::namesOfRunningActivitiesChanged);
		83
		84		connect(d->activitiesModel, &KActivities::ActivitiesModel::dataChanged, this,
		85		[this](const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) {
		86		Q_UNUSED(topLeft)
			anthonyfieroniUnsubmitted Not Done They should emit also numberOfRunnigActivitiesChanges, no? anthonyfieroni: They should emit also numberOfRunnigActivitiesChanges, no?
			heinAuthorUnsubmitted Not Done They don't need to. It's emitted in response to &KActivities::Consumer::runningActivitiesChanged. Actually, doing the reverse might make more sense. Hold on, I'll clean up a bit. hein: They don't need to. It's emitted in response to &KActivities::Consumer…
		87		Q_UNUSED(bottomRight)
		88
		89		if (roles.isEmpty() \|\| roles.contains(Qt::DisplayRole)) {
		90		emit namesOfRunningActivitiesChanged();
		91		}
		92		}
		93		);
67	}	94		}
68		95
69	ActivityInfo::~ActivityInfo()	96		ActivityInfo::~ActivityInfo()
70	{	97		{
71	}	98		}
72		99
73	QString ActivityInfo::currentActivity() const	100		QString ActivityInfo::currentActivity() const
74	{	101		{
Show All 25 Lines