1
=== modified file 'include/Notification.h'
2
--- include/Notification.h	2013-10-01 08:49:54 +0000
3
+++ include/Notification.h	2013-10-15 07:33:12 +0000
4
@@ -109,6 +109,7 @@
5
109
    void setType(Type type);
109
    void setType(Type type);
6
110
    ActionModel* getActions() const;
110
    ActionModel* getActions() const;
7
111
    void setActions(QStringList actions);
111
    void setActions(QStringList actions);
8
112
    void detachFromServer();
9
112
113
10
113
    QVariantMap getHints() const;
114
    QVariantMap getHints() const;
11
114
    void setHints(const QVariantMap& hints);
115
    void setHints(const QVariantMap& hints);
12
115
116
13
=== modified file 'src/Notification.cpp'
14
--- src/Notification.cpp	2013-10-02 23:05:05 +0000
15
+++ src/Notification.cpp	2013-10-15 07:33:12 +0000
16
@@ -192,6 +192,19 @@
17
192
    }
192
    }
18
193
}
193
}
19
194
194
20
195
void Notification::detachFromServer() {
21
196
    /*
22
197
     * FIXME. This function should not exist. In fact
23
198
     * a notification should not need to know the server
24
199
     * it is connected to. Instead the way p->server
25
200
     * is used needs to be converted into a proper
26
201
     * Qt signal. Unfortunately, due to deadlines,
27
202
     * we did not have time. The next time this is worked
28
203
     * on, fix this properly.
29
204
     */
30
205
    p->server = nullptr;
31
206
}
32
207
33
195
QVariantMap Notification::getHints() const {
208
QVariantMap Notification::getHints() const {
34
196
    return p->hints;
209
    return p->hints;
35
197
}
210
}
36
198
211
37
=== modified file 'src/NotificationModel.cpp'
38
--- src/NotificationModel.cpp	2013-10-01 08:49:54 +0000
39
+++ src/NotificationModel.cpp	2013-10-15 07:33:12 +0000
40
@@ -45,6 +45,18 @@
41
45
}
45
}
42
46
46
43
47
NotificationModel::~NotificationModel() {
47
NotificationModel::~NotificationModel() {
44
48
    for(int i=0; i<p->ephemeralQueue.size(); i++) {
45
49
        p->ephemeralQueue[i]->detachFromServer();
46
50
    }
47
51
    for(int i=0; i<p->interactiveQueue.size(); i++) {
48
52
        p->interactiveQueue[i]->detachFromServer();
49
53
    }
50
54
    for(int i=0; i<p->snapQueue.size(); i++) {
51
55
        p->snapQueue[i]->detachFromServer();
52
56
    }
53
57
    for(int i=0; i<p->displayedNotifications.size(); i++) {
54
58
        p->displayedNotifications[i]->detachFromServer();
55
59
    }
56
48
}
60
}
57
49
61
58
50
int NotificationModel::rowCount(const QModelIndex &parent) const {
62
int NotificationModel::rowCount(const QModelIndex &parent) const {
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-10-15
Michał Sawicz		2013-10-14	Approve on 2013-10-15
Review via email: mp+190931@code.launchpad.net
1	=== modified file 'include/Notification.h'
2	--- include/Notification.h 2013-10-01 08:49:54 +0000
3	+++ include/Notification.h 2013-10-15 07:33:12 +0000
4	@@ -109,6 +109,7 @@
5	109	void setType(Type type);	109	void setType(Type type);
6	110	ActionModel* getActions() const;	110	ActionModel* getActions() const;
7	111	void setActions(QStringList actions);	111	void setActions(QStringList actions);
8			112	void detachFromServer();
9	112		113
10	113	QVariantMap getHints() const;	114	QVariantMap getHints() const;
11	114	void setHints(const QVariantMap& hints);	115	void setHints(const QVariantMap& hints);
12	115		116
13	=== modified file 'src/Notification.cpp'
14	--- src/Notification.cpp 2013-10-02 23:05:05 +0000
15	+++ src/Notification.cpp 2013-10-15 07:33:12 +0000
16	@@ -192,6 +192,19 @@
17	192	}	192	}
18	193	}	193	}
19	194		194
20			195	void Notification::detachFromServer() {
21			196	/*
22			197	* FIXME. This function should not exist. In fact
23			198	* a notification should not need to know the server
24			199	* it is connected to. Instead the way p->server
25			200	* is used needs to be converted into a proper
26			201	* Qt signal. Unfortunately, due to deadlines,
27			202	* we did not have time. The next time this is worked
28			203	* on, fix this properly.
29			204	*/
30			205	p->server = nullptr;
31			206	}
32			207
33	195	QVariantMap Notification::getHints() const {	208	QVariantMap Notification::getHints() const {
34	196	return p->hints;	209	return p->hints;
35	197	}	210	}
36	198		211
37	=== modified file 'src/NotificationModel.cpp'
38	--- src/NotificationModel.cpp 2013-10-01 08:49:54 +0000
39	+++ src/NotificationModel.cpp 2013-10-15 07:33:12 +0000
40	@@ -45,6 +45,18 @@
41	45	}	45	}
42	46		46
43	47	NotificationModel::~NotificationModel() {	47	NotificationModel::~NotificationModel() {
44			48	for(int i=0; i<p->ephemeralQueue.size(); i++) {
45			49	p->ephemeralQueue[i]->detachFromServer();
46			50	}
47			51	for(int i=0; i<p->interactiveQueue.size(); i++) {
48			52	p->interactiveQueue[i]->detachFromServer();
49			53	}
50			54	for(int i=0; i<p->snapQueue.size(); i++) {
51			55	p->snapQueue[i]->detachFromServer();
52			56	}
53			57	for(int i=0; i<p->displayedNotifications.size(); i++) {
54			58	p->displayedNotifications[i]->detachFromServer();
55			59	}
56	48	}	60	}
57	49		61
58	50	int NotificationModel::rowCount(const QModelIndex &parent) const {	62	int NotificationModel::rowCount(const QModelIndex &parent) const {