Merge lp:~gerboland/unity-mir/add-licences into lp:unity-mir

Proposed by Gerry Boland
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~gerboland/unity-mir/add-licences
Merge into: lp:unity-mir
Diff against target: 1154 lines (+652/-97)
37 files modified
src/modules/Unity/ApplicationManager/application.cpp (+19/-14)
src/modules/Unity/ApplicationManager/application.h (+15/-14)
src/modules/Unity/ApplicationManager/application_list_model.cpp (+19/-14)
src/modules/Unity/ApplicationManager/application_list_model.h (+15/-14)
src/modules/Unity/ApplicationManager/application_manager.cpp (+19/-3)
src/modules/Unity/ApplicationManager/application_manager.h (+16/-0)
src/modules/Unity/ApplicationManager/applicationscreenshotprovider.cpp (+19/-2)
src/modules/Unity/ApplicationManager/applicationscreenshotprovider.h (+16/-0)
src/modules/Unity/ApplicationManager/dbuswindowstack.cpp (+18/-2)
src/modules/Unity/ApplicationManager/dbuswindowstack.h (+16/-0)
src/modules/Unity/ApplicationManager/desktopfilereader.cpp (+20/-0)
src/modules/Unity/ApplicationManager/desktopfilereader.h (+16/-0)
src/modules/Unity/ApplicationManager/plugin.cpp (+21/-0)
src/modules/Unity/SurfaceManager/inputarea.cpp (+18/-0)
src/modules/Unity/SurfaceManager/inputarea.h (+19/-0)
src/modules/Unity/SurfaceManager/mirsurface.cpp (+20/-0)
src/modules/Unity/SurfaceManager/mirsurface.h (+16/-0)
src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp (+20/-3)
src/modules/Unity/SurfaceManager/mirsurfacemanager.h (+17/-0)
src/modules/Unity/SurfaceManager/plugin.cpp (+38/-16)
src/unity-mir/initialsurfaceplacementstrategy.cpp (+19/-1)
src/unity-mir/initialsurfaceplacementstrategy.h (+17/-0)
src/unity-mir/logging.h (+15/-14)
src/unity-mir/qmirserver.cpp (+16/-0)
src/unity-mir/qmirserver.h (+16/-0)
src/unity-mir/qmirserverapplication.cpp (+16/-0)
src/unity-mir/qmirserverapplication.h (+16/-0)
src/unity-mir/sessionauthorizer.cpp (+16/-0)
src/unity-mir/sessionauthorizer.h (+16/-0)
src/unity-mir/sessionlistener.cpp (+16/-0)
src/unity-mir/sessionlistener.h (+16/-0)
src/unity-mir/shellserverconfiguration.cpp (+16/-0)
src/unity-mir/shellserverconfiguration.h (+16/-0)
src/unity-mir/surfacebuilder.cpp (+16/-0)
src/unity-mir/surfacebuilder.h (+16/-0)
src/unity-mir/surfacesource.cpp (+16/-0)
src/unity-mir/surfacesource.h (+16/-0)
To merge this branch: bzr merge lp:~gerboland/unity-mir/add-licences
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Review via email: mp+179432@code.launchpad.net

Commit message

Add licence headers and small cleaning of includes and indent fixes

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Good :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/ApplicationManager/application.cpp'
2--- src/modules/Unity/ApplicationManager/application.cpp 2013-07-19 17:29:44 +0000
3+++ src/modules/Unity/ApplicationManager/application.cpp 2013-08-09 13:18:43 +0000
4@@ -1,23 +1,28 @@
5-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
6-// Copyright © 2013 Canonical Ltd.
7-//
8-// This program is free software: you can redistribute it and/or modify it under
9-// the terms of the GNU Lesser General Public License version 3, as published by
10-// the Free Software Foundation.
11-//
12-// This program is distributed in the hope that it will be useful, but WITHOUT
13-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
14-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15-// Lesser General Public License for more details.
16-//
17-// You should have received a copy of the GNU Lesser General Public License
18-// along with this program. If not, see <http://www.gnu.org/licenses/>.
19+/*
20+ * Copyright (C) 2013 Canonical, Ltd.
21+ *
22+ * This program is free software: you can redistribute it and/or modify it under
23+ * the terms of the GNU Lesser General Public License version 3, as published by
24+ * the Free Software Foundation.
25+ *
26+ * This program is distributed in the hope that it will be useful, but WITHOUT
27+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
28+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29+ * Lesser General Public License for more details.
30+ *
31+ * You should have received a copy of the GNU Lesser General Public License
32+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
33+ */
34
35+// local
36 #include "application.h"
37 #include "application_manager.h"
38 #include "desktopfilereader.h"
39+
40+// unity-mir
41 #include "logging.h"
42
43+// mir
44 #include <mir/shell/application_session.h>
45
46 Application::Application(DesktopFileReader* desktopData, qint64 pid,
47
48=== modified file 'src/modules/Unity/ApplicationManager/application.h'
49--- src/modules/Unity/ApplicationManager/application.h 2013-07-19 17:29:44 +0000
50+++ src/modules/Unity/ApplicationManager/application.h 2013-08-09 13:18:43 +0000
51@@ -1,17 +1,18 @@
52-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
53-// Copyright © 2013 Canonical Ltd.
54-//
55-// This program is free software: you can redistribute it and/or modify it under
56-// the terms of the GNU Lesser General Public License version 3, as published by
57-// the Free Software Foundation.
58-//
59-// This program is distributed in the hope that it will be useful, but WITHOUT
60-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
61-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
62-// Lesser General Public License for more details.
63-//
64-// You should have received a copy of the GNU Lesser General Public License
65-// along with this program. If not, see <http://www.gnu.org/licenses/>.
66+/*
67+ * Copyright (C) 2013 Canonical, Ltd.
68+ *
69+ * This program is free software: you can redistribute it and/or modify it under
70+ * the terms of the GNU Lesser General Public License version 3, as published by
71+ * the Free Software Foundation.
72+ *
73+ * This program is distributed in the hope that it will be useful, but WITHOUT
74+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
75+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
76+ * Lesser General Public License for more details.
77+ *
78+ * You should have received a copy of the GNU Lesser General Public License
79+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
80+ */
81
82 #ifndef APPLICATION_H
83 #define APPLICATION_H
84
85=== modified file 'src/modules/Unity/ApplicationManager/application_list_model.cpp'
86--- src/modules/Unity/ApplicationManager/application_list_model.cpp 2013-07-24 15:44:35 +0000
87+++ src/modules/Unity/ApplicationManager/application_list_model.cpp 2013-08-09 13:18:43 +0000
88@@ -1,22 +1,27 @@
89-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
90-// Copyright © 2013 Canonical Ltd.
91-//
92-// This program is free software: you can redistribute it and/or modify it under
93-// the terms of the GNU Lesser General Public License version 3, as published by
94-// the Free Software Foundation.
95-//
96-// This program is distributed in the hope that it will be useful, but WITHOUT
97-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
98-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
99-// Lesser General Public License for more details.
100-//
101-// You should have received a copy of the GNU Lesser General Public License
102-// along with this program. If not, see <http://www.gnu.org/licenses/>.
103+/*
104+ * Copyright (C) 2013 Canonical, Ltd.
105+ *
106+ * This program is free software: you can redistribute it and/or modify it under
107+ * the terms of the GNU Lesser General Public License version 3, as published by
108+ * the Free Software Foundation.
109+ *
110+ * This program is distributed in the hope that it will be useful, but WITHOUT
111+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
112+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
113+ * Lesser General Public License for more details.
114+ *
115+ * You should have received a copy of the GNU Lesser General Public License
116+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
117+ */
118
119+// local
120 #include "application_list_model.h"
121 #include "application.h"
122+
123+// unity-mir
124 #include "logging.h"
125
126+// mir
127 #include <mir/shell/application_session.h>
128
129 namespace msh = mir::shell;
130
131=== modified file 'src/modules/Unity/ApplicationManager/application_list_model.h'
132--- src/modules/Unity/ApplicationManager/application_list_model.h 2013-07-24 15:44:35 +0000
133+++ src/modules/Unity/ApplicationManager/application_list_model.h 2013-08-09 13:18:43 +0000
134@@ -1,17 +1,18 @@
135-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
136-// Copyright © 2013 Canonical Ltd.
137-//
138-// This program is free software: you can redistribute it and/or modify it under
139-// the terms of the GNU Lesser General Public License version 3, as published by
140-// the Free Software Foundation.
141-//
142-// This program is distributed in the hope that it will be useful, but WITHOUT
143-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
144-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
145-// Lesser General Public License for more details.
146-//
147-// You should have received a copy of the GNU Lesser General Public License
148-// along with this program. If not, see <http://www.gnu.org/licenses/>.
149+/*
150+ * Copyright (C) 2013 Canonical, Ltd.
151+ *
152+ * This program is free software: you can redistribute it and/or modify it under
153+ * the terms of the GNU Lesser General Public License version 3, as published by
154+ * the Free Software Foundation.
155+ *
156+ * This program is distributed in the hope that it will be useful, but WITHOUT
157+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
158+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
159+ * Lesser General Public License for more details.
160+ *
161+ * You should have received a copy of the GNU Lesser General Public License
162+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
163+ */
164
165 #ifndef APPLICATION_LIST_MODEL_H
166 #define APPLICATION_LIST_MODEL_H
167
168=== modified file 'src/modules/Unity/ApplicationManager/application_manager.cpp'
169--- src/modules/Unity/ApplicationManager/application_manager.cpp 2013-07-25 13:51:47 +0000
170+++ src/modules/Unity/ApplicationManager/application_manager.cpp 2013-08-09 13:18:43 +0000
171@@ -1,8 +1,25 @@
172-//local
173+/*
174+ * Copyright (C) 2013 Canonical, Ltd.
175+ *
176+ * This program is free software: you can redistribute it and/or modify it under
177+ * the terms of the GNU Lesser General Public License version 3, as published by
178+ * the Free Software Foundation.
179+ *
180+ * This program is distributed in the hope that it will be useful, but WITHOUT
181+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
182+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
183+ * Lesser General Public License for more details.
184+ *
185+ * You should have received a copy of the GNU Lesser General Public License
186+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
187+ */
188+
189+// local
190 #include "application_manager.h"
191 #include "application_list_model.h"
192 #include "application.h"
193 #include "desktopfilereader.h"
194+#include "dbuswindowstack.h"
195
196 // unity-mir
197 #include "qmirserverapplication.h"
198@@ -10,12 +27,11 @@
199 #include "sessionlistener.h"
200 #include "sessionauthorizer.h"
201 #include "logging.h"
202-#include "dbuswindowstack.h"
203
204 // mir
205 #include <mir/shell/session_manager.h>
206
207-// qt
208+// Qt
209 #include <QCoreApplication>
210 #include <QProcess>
211
212
213=== modified file 'src/modules/Unity/ApplicationManager/application_manager.h'
214--- src/modules/Unity/ApplicationManager/application_manager.h 2013-07-24 15:44:35 +0000
215+++ src/modules/Unity/ApplicationManager/application_manager.h 2013-08-09 13:18:43 +0000
216@@ -1,3 +1,19 @@
217+/*
218+ * Copyright (C) 2013 Canonical, Ltd.
219+ *
220+ * This program is free software: you can redistribute it and/or modify it under
221+ * the terms of the GNU Lesser General Public License version 3, as published by
222+ * the Free Software Foundation.
223+ *
224+ * This program is distributed in the hope that it will be useful, but WITHOUT
225+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
226+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
227+ * Lesser General Public License for more details.
228+ *
229+ * You should have received a copy of the GNU Lesser General Public License
230+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
231+ */
232+
233 #ifndef APPLICATIONMANAGER_H
234 #define APPLICATIONMANAGER_H
235
236
237=== modified file 'src/modules/Unity/ApplicationManager/applicationscreenshotprovider.cpp'
238--- src/modules/Unity/ApplicationManager/applicationscreenshotprovider.cpp 2013-07-23 17:15:04 +0000
239+++ src/modules/Unity/ApplicationManager/applicationscreenshotprovider.cpp 2013-08-09 13:18:43 +0000
240@@ -1,14 +1,31 @@
241+/*
242+ * Copyright (C) 2013 Canonical, Ltd.
243+ *
244+ * This program is free software: you can redistribute it and/or modify it under
245+ * the terms of the GNU Lesser General Public License version 3, as published by
246+ * the Free Software Foundation.
247+ *
248+ * This program is distributed in the hope that it will be useful, but WITHOUT
249+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
250+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
251+ * Lesser General Public License for more details.
252+ *
253+ * You should have received a copy of the GNU Lesser General Public License
254+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
255+ */
256+
257+// local
258 #include "applicationscreenshotprovider.h"
259 #include "application_manager.h"
260 #include "application_list_model.h"
261 #include "application.h"
262
263+// unity-mir
264 #include "logging.h"
265
266+// mir
267 #include "mirserver/mir/shell/application_session.h"
268
269-#include <stdio.h>
270-
271 ApplicationScreenshotProvider::ApplicationScreenshotProvider(ApplicationManager *appManager)
272 : QQuickImageProvider(QQuickImageProvider::Image)
273 , m_appManager(appManager)
274
275=== modified file 'src/modules/Unity/ApplicationManager/applicationscreenshotprovider.h'
276--- src/modules/Unity/ApplicationManager/applicationscreenshotprovider.h 2013-07-19 17:29:44 +0000
277+++ src/modules/Unity/ApplicationManager/applicationscreenshotprovider.h 2013-08-09 13:18:43 +0000
278@@ -1,3 +1,19 @@
279+/*
280+ * Copyright (C) 2013 Canonical, Ltd.
281+ *
282+ * This program is free software: you can redistribute it and/or modify it under
283+ * the terms of the GNU Lesser General Public License version 3, as published by
284+ * the Free Software Foundation.
285+ *
286+ * This program is distributed in the hope that it will be useful, but WITHOUT
287+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
288+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
289+ * Lesser General Public License for more details.
290+ *
291+ * You should have received a copy of the GNU Lesser General Public License
292+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
293+ */
294+
295 #ifndef APPLICATIONSCREENSHOTPROVIDER_H
296 #define APPLICATIONSCREENSHOTPROVIDER_H
297
298
299=== modified file 'src/modules/Unity/ApplicationManager/dbuswindowstack.cpp'
300--- src/modules/Unity/ApplicationManager/dbuswindowstack.cpp 2013-07-24 15:07:38 +0000
301+++ src/modules/Unity/ApplicationManager/dbuswindowstack.cpp 2013-08-09 13:18:43 +0000
302@@ -1,8 +1,24 @@
303+/*
304+ * Copyright (C) 2013 Canonical, Ltd.
305+ *
306+ * This program is free software: you can redistribute it and/or modify it under
307+ * the terms of the GNU Lesser General Public License version 3, as published by
308+ * the Free Software Foundation.
309+ *
310+ * This program is distributed in the hope that it will be useful, but WITHOUT
311+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
312+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
313+ * Lesser General Public License for more details.
314+ *
315+ * You should have received a copy of the GNU Lesser General Public License
316+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
317+ */
318
319+// local
320 #include "dbuswindowstack.h"
321-
322 #include "application_manager.h"
323
324+// Qt
325 #include <QDBusConnection>
326 #include <QDBusMetaType>
327
328@@ -83,4 +99,4 @@
329 a.endStructure();
330
331 return a;
332-}
333\ No newline at end of file
334+}
335
336=== modified file 'src/modules/Unity/ApplicationManager/dbuswindowstack.h'
337--- src/modules/Unity/ApplicationManager/dbuswindowstack.h 2013-07-24 15:07:38 +0000
338+++ src/modules/Unity/ApplicationManager/dbuswindowstack.h 2013-08-09 13:18:43 +0000
339@@ -1,3 +1,19 @@
340+/*
341+ * Copyright (C) 2013 Canonical, Ltd.
342+ *
343+ * This program is free software: you can redistribute it and/or modify it under
344+ * the terms of the GNU Lesser General Public License version 3, as published by
345+ * the Free Software Foundation.
346+ *
347+ * This program is distributed in the hope that it will be useful, but WITHOUT
348+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
349+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
350+ * Lesser General Public License for more details.
351+ *
352+ * You should have received a copy of the GNU Lesser General Public License
353+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
354+ */
355+
356 #ifndef DBUSWINDOWSTACK_H
357 #define DBUSWINDOWSTACK_H
358
359
360=== modified file 'src/modules/Unity/ApplicationManager/desktopfilereader.cpp'
361--- src/modules/Unity/ApplicationManager/desktopfilereader.cpp 2013-07-19 17:29:44 +0000
362+++ src/modules/Unity/ApplicationManager/desktopfilereader.cpp 2013-08-09 13:18:43 +0000
363@@ -1,6 +1,26 @@
364+/*
365+ * Copyright (C) 2013 Canonical, Ltd.
366+ *
367+ * This program is free software: you can redistribute it and/or modify it under
368+ * the terms of the GNU Lesser General Public License version 3, as published by
369+ * the Free Software Foundation.
370+ *
371+ * This program is distributed in the hope that it will be useful, but WITHOUT
372+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
373+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
374+ * Lesser General Public License for more details.
375+ *
376+ * You should have received a copy of the GNU Lesser General Public License
377+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
378+ */
379+
380+// local
381 #include "desktopfilereader.h"
382+
383+// unity-mir
384 #include "logging.h"
385
386+// Qt
387 #include <QFile>
388
389 // Retrieves the size of an array at compile time.
390
391=== modified file 'src/modules/Unity/ApplicationManager/desktopfilereader.h'
392--- src/modules/Unity/ApplicationManager/desktopfilereader.h 2013-07-19 17:29:44 +0000
393+++ src/modules/Unity/ApplicationManager/desktopfilereader.h 2013-08-09 13:18:43 +0000
394@@ -1,3 +1,19 @@
395+/*
396+ * Copyright (C) 2013 Canonical, Ltd.
397+ *
398+ * This program is free software: you can redistribute it and/or modify it under
399+ * the terms of the GNU Lesser General Public License version 3, as published by
400+ * the Free Software Foundation.
401+ *
402+ * This program is distributed in the hope that it will be useful, but WITHOUT
403+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
404+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
405+ * Lesser General Public License for more details.
406+ *
407+ * You should have received a copy of the GNU Lesser General Public License
408+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
409+ */
410+
411 #ifndef DESKTOPFILEREADER_H
412 #define DESKTOPFILEREADER_H
413
414
415=== modified file 'src/modules/Unity/ApplicationManager/plugin.cpp'
416--- src/modules/Unity/ApplicationManager/plugin.cpp 2013-07-19 17:29:44 +0000
417+++ src/modules/Unity/ApplicationManager/plugin.cpp 2013-08-09 13:18:43 +0000
418@@ -1,8 +1,29 @@
419+/*
420+ * Copyright (C) 2013 Canonical, Ltd.
421+ *
422+ * This program is free software: you can redistribute it and/or modify it under
423+ * the terms of the GNU Lesser General Public License version 3, as published by
424+ * the Free Software Foundation.
425+ *
426+ * This program is distributed in the hope that it will be useful, but WITHOUT
427+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
428+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
429+ * Lesser General Public License for more details.
430+ *
431+ * You should have received a copy of the GNU Lesser General Public License
432+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
433+ */
434+
435+// Qt
436 #include <QtQml/QtQml>
437+
438+// local
439 #include "application.h"
440 #include "application_manager.h"
441 #include "application_list_model.h"
442 #include "applicationscreenshotprovider.h"
443+
444+// unity-mir
445 #include "logging.h"
446
447 static QObject* applicationManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
448
449=== modified file 'src/modules/Unity/SurfaceManager/inputarea.cpp'
450--- src/modules/Unity/SurfaceManager/inputarea.cpp 2013-08-06 17:22:17 +0000
451+++ src/modules/Unity/SurfaceManager/inputarea.cpp 2013-08-09 13:18:43 +0000
452@@ -1,3 +1,19 @@
453+/*
454+ * Copyright (C) 2013 Canonical, Ltd.
455+ *
456+ * This program is free software: you can redistribute it and/or modify it under
457+ * the terms of the GNU Lesser General Public License version 3, as published by
458+ * the Free Software Foundation.
459+ *
460+ * This program is distributed in the hope that it will be useful, but WITHOUT
461+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
462+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
463+ * Lesser General Public License for more details.
464+ *
465+ * You should have received a copy of the GNU Lesser General Public License
466+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
467+ */
468+
469 //Qt
470 #include <QCoreApplication>
471
472@@ -8,6 +24,8 @@
473 #include "inputarea.h"
474 #include "mirsurface.h"
475 #include "mirsurfacemanager.h"
476+
477+// unity-mir
478 #include "qmirserverapplication.h"
479 #include "shellserverconfiguration.h"
480 #include "surfacesource.h"
481
482=== modified file 'src/modules/Unity/SurfaceManager/inputarea.h'
483--- src/modules/Unity/SurfaceManager/inputarea.h 2013-08-06 17:22:17 +0000
484+++ src/modules/Unity/SurfaceManager/inputarea.h 2013-08-09 13:18:43 +0000
485@@ -1,12 +1,31 @@
486+/*
487+ * Copyright (C) 2013 Canonical, Ltd.
488+ *
489+ * This program is free software: you can redistribute it and/or modify it under
490+ * the terms of the GNU Lesser General Public License version 3, as published by
491+ * the Free Software Foundation.
492+ *
493+ * This program is distributed in the hope that it will be useful, but WITHOUT
494+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
495+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
496+ * Lesser General Public License for more details.
497+ *
498+ * You should have received a copy of the GNU Lesser General Public License
499+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
500+ */
501+
502 #ifndef INPUTFILTERAREA_H
503 #define INPUTFILTERAREA_H
504
505+// std
506 #include <memory>
507
508+// Qt
509 #include <QtQuick/QQuickItem>
510 #include <QtCore/QLinkedList>
511 #include <QtCore/QMetaObject>
512
513+// mir
514 #include <mircommon/mir/geometry/rectangle.h>
515
516 class MirSurface;
517
518=== modified file 'src/modules/Unity/SurfaceManager/mirsurface.cpp'
519--- src/modules/Unity/SurfaceManager/mirsurface.cpp 2013-07-30 11:29:04 +0000
520+++ src/modules/Unity/SurfaceManager/mirsurface.cpp 2013-08-09 13:18:43 +0000
521@@ -1,7 +1,27 @@
522+/*
523+ * Copyright (C) 2013 Canonical, Ltd.
524+ *
525+ * This program is free software: you can redistribute it and/or modify it under
526+ * the terms of the GNU Lesser General Public License version 3, as published by
527+ * the Free Software Foundation.
528+ *
529+ * This program is distributed in the hope that it will be useful, but WITHOUT
530+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
531+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
532+ * Lesser General Public License for more details.
533+ *
534+ * You should have received a copy of the GNU Lesser General Public License
535+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
536+ */
537+
538+// local
539 #include "mirsurface.h"
540 #include "inputarea.h"
541+
542+// unity-mir
543 #include "logging.h"
544
545+// Qt
546 #include <mircommon/mir/geometry/rectangle.h>
547
548 namespace mg = mir::geometry;
549
550=== modified file 'src/modules/Unity/SurfaceManager/mirsurface.h'
551--- src/modules/Unity/SurfaceManager/mirsurface.h 2013-07-30 11:29:04 +0000
552+++ src/modules/Unity/SurfaceManager/mirsurface.h 2013-08-09 13:18:43 +0000
553@@ -1,3 +1,19 @@
554+/*
555+ * Copyright (C) 2013 Canonical, Ltd.
556+ *
557+ * This program is free software: you can redistribute it and/or modify it under
558+ * the terms of the GNU Lesser General Public License version 3, as published by
559+ * the Free Software Foundation.
560+ *
561+ * This program is distributed in the hope that it will be useful, but WITHOUT
562+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
563+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
564+ * Lesser General Public License for more details.
565+ *
566+ * You should have received a copy of the GNU Lesser General Public License
567+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
568+ */
569+
570 #ifndef MIRSURFACE_H
571 #define MIRSURFACE_H
572
573
574=== modified file 'src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp'
575--- src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp 2013-08-06 17:22:17 +0000
576+++ src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp 2013-08-09 13:18:43 +0000
577@@ -1,15 +1,32 @@
578+/*
579+ * Copyright (C) 2013 Canonical, Ltd.
580+ *
581+ * This program is free software: you can redistribute it and/or modify it under
582+ * the terms of the GNU Lesser General Public License version 3, as published by
583+ * the Free Software Foundation.
584+ *
585+ * This program is distributed in the hope that it will be useful, but WITHOUT
586+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
587+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
588+ * Lesser General Public License for more details.
589+ *
590+ * You should have received a copy of the GNU Lesser General Public License
591+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
592+ */
593+
594 // Qt
595 #include <QGuiApplication>
596 #include <qpa/qplatformnativeinterface.h>
597
598 // local
599+#include "mirsurfacemanager.h"
600+#include "mirsurface.h"
601+
602+// unity-mir
603 #include "qmirserverapplication.h"
604 #include "shellserverconfiguration.h"
605 #include "sessionlistener.h"
606 #include "surfacesource.h"
607-#include "mirsurfacemanager.h"
608-#include "mirsurface.h"
609-
610 #include "logging.h"
611
612 namespace msh = mir::shell;
613
614=== modified file 'src/modules/Unity/SurfaceManager/mirsurfacemanager.h'
615--- src/modules/Unity/SurfaceManager/mirsurfacemanager.h 2013-08-06 17:22:17 +0000
616+++ src/modules/Unity/SurfaceManager/mirsurfacemanager.h 2013-08-09 13:18:43 +0000
617@@ -1,3 +1,19 @@
618+/*
619+ * Copyright (C) 2013 Canonical, Ltd.
620+ *
621+ * This program is free software: you can redistribute it and/or modify it under
622+ * the terms of the GNU Lesser General Public License version 3, as published by
623+ * the Free Software Foundation.
624+ *
625+ * This program is distributed in the hope that it will be useful, but WITHOUT
626+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
627+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
628+ * Lesser General Public License for more details.
629+ *
630+ * You should have received a copy of the GNU Lesser General Public License
631+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
632+ */
633+
634 #ifndef MIR_SURFACE_MANAGER_H
635 #define MIR_SURFACE_MANAGER_H
636
637@@ -7,6 +23,7 @@
638 // Qt
639 #include <QObject>
640
641+// mir
642 #include "mirsurface.h"
643
644 class ShellServerConfiguration;
645
646=== modified file 'src/modules/Unity/SurfaceManager/plugin.cpp'
647--- src/modules/Unity/SurfaceManager/plugin.cpp 2013-07-30 11:29:04 +0000
648+++ src/modules/Unity/SurfaceManager/plugin.cpp 2013-08-09 13:18:43 +0000
649@@ -1,29 +1,51 @@
650+/*
651+ * Copyright (C) 2013 Canonical, Ltd.
652+ *
653+ * This program is free software: you can redistribute it and/or modify it under
654+ * the terms of the GNU Lesser General Public License version 3, as published by
655+ * the Free Software Foundation.
656+ *
657+ * This program is distributed in the hope that it will be useful, but WITHOUT
658+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
659+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
660+ * Lesser General Public License for more details.
661+ *
662+ * You should have received a copy of the GNU Lesser General Public License
663+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
664+ */
665+
666+// Qt
667 #include <QtQml/QtQml>
668+
669+// local
670 #include "mirsurfacemanager.h"
671 #include "mirsurface.h"
672 #include "inputarea.h"
673+
674+// unity-mir
675 #include "logging.h"
676
677 static QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
678- Q_UNUSED(engine);
679- Q_UNUSED(scriptEngine);
680- DLOG("surfaceManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
681- return MirSurfaceManager::singleton();
682+ Q_UNUSED(engine);
683+ Q_UNUSED(scriptEngine);
684+ DLOG("surfaceManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
685+ return MirSurfaceManager::singleton();
686 }
687
688 class UbuntuApplicationPlugin : public QQmlExtensionPlugin {
689- Q_OBJECT
690- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
691-
692- virtual void registerTypes(const char* uri) {
693- DLOG("UbuntuSurfacePlugin::registerTypes (this=%p, uri='%s')", this, uri);
694- ASSERT(QLatin1String(uri) == QLatin1String("Unity.SurfaceManager"));
695- qmlRegisterSingletonType<MirSurfaceManager>(
696- uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
697- qmlRegisterUncreatableType<MirSurface>(
698- uri, 0, 1, "MirSurface", "MirSurface can't be instantiated");
699- qmlRegisterType<InputArea>(uri, 0, 1, "InputArea");
700- }
701+ Q_OBJECT
702+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
703+
704+ virtual void registerTypes(const char* uri) {
705+ DLOG("UbuntuSurfacePlugin::registerTypes (this=%p, uri='%s')", this, uri);
706+
707+ ASSERT(QLatin1String(uri) == QLatin1String("Unity.SurfaceManager"));
708+ qmlRegisterSingletonType<MirSurfaceManager>(
709+ uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
710+ qmlRegisterUncreatableType<MirSurface>(
711+ uri, 0, 1, "MirSurface", "MirSurface can't be instantiated");
712+ qmlRegisterType<InputArea>(uri, 0, 1, "InputArea");
713+ }
714 };
715
716 #include "plugin.moc"
717
718=== modified file 'src/unity-mir/initialsurfaceplacementstrategy.cpp'
719--- src/unity-mir/initialsurfaceplacementstrategy.cpp 2013-07-22 12:26:22 +0000
720+++ src/unity-mir/initialsurfaceplacementstrategy.cpp 2013-08-09 13:18:43 +0000
721@@ -1,5 +1,23 @@
722+/*
723+ * Copyright (C) 2013 Canonical, Ltd.
724+ *
725+ * This program is free software: you can redistribute it and/or modify it under
726+ * the terms of the GNU Lesser General Public License version 3, as published by
727+ * the Free Software Foundation.
728+ *
729+ * This program is distributed in the hope that it will be useful, but WITHOUT
730+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
731+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
732+ * Lesser General Public License for more details.
733+ *
734+ * You should have received a copy of the GNU Lesser General Public License
735+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
736+ */
737+
738+// local
739 #include "initialsurfaceplacementstrategy.h"
740
741+// mir
742 #include "mir/shell/surface_creation_parameters.h"
743 #include "mir/geometry/rectangle.h"
744
745@@ -19,7 +37,7 @@
746 Rectangle rect{placedParameters.top_left, placedParameters.size};
747 m_displayLayout->size_to_output(rect);
748 placedParameters.size = rect.size;
749-
750+
751 // position surface initially off-screen, until ready to be animated in
752 // placedParameters.top_left = Point{ X{rect.size.width.as_int()}, Y{0}};
753
754
755=== modified file 'src/unity-mir/initialsurfaceplacementstrategy.h'
756--- src/unity-mir/initialsurfaceplacementstrategy.h 2013-07-22 12:26:22 +0000
757+++ src/unity-mir/initialsurfaceplacementstrategy.h 2013-08-09 13:18:43 +0000
758@@ -1,7 +1,24 @@
759+/*
760+ * Copyright (C) 2013 Canonical, Ltd.
761+ *
762+ * This program is free software: you can redistribute it and/or modify it under
763+ * the terms of the GNU Lesser General Public License version 3, as published by
764+ * the Free Software Foundation.
765+ *
766+ * This program is distributed in the hope that it will be useful, but WITHOUT
767+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
768+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
769+ * Lesser General Public License for more details.
770+ *
771+ * You should have received a copy of the GNU Lesser General Public License
772+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
773+ */
774+
775 #ifndef INITIALSURFACEPLACEMENTSTRATEGY_H
776 #define INITIALSURFACEPLACEMENTSTRATEGY_H
777
778 #include <memory>
779+
780 #include "mirserver/mir/shell/placement_strategy.h"
781 #include "mirserver/mir/shell/display_layout.h"
782
783
784=== modified file 'src/unity-mir/logging.h'
785--- src/unity-mir/logging.h 2013-07-19 17:29:44 +0000
786+++ src/unity-mir/logging.h 2013-08-09 13:18:43 +0000
787@@ -1,17 +1,18 @@
788-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
789-// Copyright © 2013 Canonical Ltd.
790-//
791-// This program is free software: you can redistribute it and/or modify it under
792-// the terms of the GNU Lesser General Public License version 3, as published by
793-// the Free Software Foundation.
794-//
795-// This program is distributed in the hope that it will be useful, but WITHOUT
796-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
797-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
798-// Lesser General Public License for more details.
799-//
800-// You should have received a copy of the GNU Lesser General Public License
801-// along with this program. If not, see <http://www.gnu.org/licenses/>.
802+/*
803+ * Copyright (C) 2013 Canonical, Ltd.
804+ *
805+ * This program is free software: you can redistribute it and/or modify it under
806+ * the terms of the GNU Lesser General Public License version 3, as published by
807+ * the Free Software Foundation.
808+ *
809+ * This program is distributed in the hope that it will be useful, but WITHOUT
810+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
811+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
812+ * Lesser General Public License for more details.
813+ *
814+ * You should have received a copy of the GNU Lesser General Public License
815+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
816+ */
817
818 #ifndef UBUNTU_APPLICATION_PLUGIN_LOGGING_H
819 #define UBUNTU_APPLICATION_PLUGIN_LOGGING_H
820
821=== modified file 'src/unity-mir/qmirserver.cpp'
822--- src/unity-mir/qmirserver.cpp 2013-07-24 23:10:02 +0000
823+++ src/unity-mir/qmirserver.cpp 2013-08-09 13:18:43 +0000
824@@ -1,3 +1,19 @@
825+/*
826+ * Copyright (C) 2013 Canonical, Ltd.
827+ *
828+ * This program is free software: you can redistribute it and/or modify it under
829+ * the terms of the GNU Lesser General Public License version 3, as published by
830+ * the Free Software Foundation.
831+ *
832+ * This program is distributed in the hope that it will be useful, but WITHOUT
833+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
834+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
835+ * Lesser General Public License for more details.
836+ *
837+ * You should have received a copy of the GNU Lesser General Public License
838+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
839+ */
840+
841 // Mir support
842 #include <mir/run_mir.h>
843 #include <mir/abnormal_exit.h>
844
845=== modified file 'src/unity-mir/qmirserver.h'
846--- src/unity-mir/qmirserver.h 2013-07-19 17:29:44 +0000
847+++ src/unity-mir/qmirserver.h 2013-08-09 13:18:43 +0000
848@@ -1,3 +1,19 @@
849+/*
850+ * Copyright (C) 2013 Canonical, Ltd.
851+ *
852+ * This program is free software: you can redistribute it and/or modify it under
853+ * the terms of the GNU Lesser General Public License version 3, as published by
854+ * the Free Software Foundation.
855+ *
856+ * This program is distributed in the hope that it will be useful, but WITHOUT
857+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
858+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
859+ * Lesser General Public License for more details.
860+ *
861+ * You should have received a copy of the GNU Lesser General Public License
862+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
863+ */
864+
865 #ifndef QMIRSERVER_H
866 #define QMIRSERVER_H
867
868
869=== modified file 'src/unity-mir/qmirserverapplication.cpp'
870--- src/unity-mir/qmirserverapplication.cpp 2013-07-19 17:29:44 +0000
871+++ src/unity-mir/qmirserverapplication.cpp 2013-08-09 13:18:43 +0000
872@@ -1,3 +1,19 @@
873+/*
874+ * Copyright (C) 2013 Canonical, Ltd.
875+ *
876+ * This program is free software: you can redistribute it and/or modify it under
877+ * the terms of the GNU Lesser General Public License version 3, as published by
878+ * the Free Software Foundation.
879+ *
880+ * This program is distributed in the hope that it will be useful, but WITHOUT
881+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
882+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
883+ * Lesser General Public License for more details.
884+ *
885+ * You should have received a copy of the GNU Lesser General Public License
886+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
887+ */
888+
889 #include "qmirserverapplication.h"
890
891 QMirServerApplication::QMirServerApplication(int &argc, char **argv, ShellServerConfiguration* serverConfiguration)
892
893=== modified file 'src/unity-mir/qmirserverapplication.h'
894--- src/unity-mir/qmirserverapplication.h 2013-07-22 12:27:05 +0000
895+++ src/unity-mir/qmirserverapplication.h 2013-08-09 13:18:43 +0000
896@@ -1,3 +1,19 @@
897+/*
898+ * Copyright (C) 2013 Canonical, Ltd.
899+ *
900+ * This program is free software: you can redistribute it and/or modify it under
901+ * the terms of the GNU Lesser General Public License version 3, as published by
902+ * the Free Software Foundation.
903+ *
904+ * This program is distributed in the hope that it will be useful, but WITHOUT
905+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
906+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
907+ * Lesser General Public License for more details.
908+ *
909+ * You should have received a copy of the GNU Lesser General Public License
910+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
911+ */
912+
913 #ifndef QMIRSERVERAPPLICATION_H
914 #define QMIRSERVERAPPLICATION_H
915
916
917=== modified file 'src/unity-mir/sessionauthorizer.cpp'
918--- src/unity-mir/sessionauthorizer.cpp 2013-08-08 19:32:28 +0000
919+++ src/unity-mir/sessionauthorizer.cpp 2013-08-09 13:18:43 +0000
920@@ -1,3 +1,19 @@
921+/*
922+ * Copyright (C) 2013 Canonical, Ltd.
923+ *
924+ * This program is free software: you can redistribute it and/or modify it under
925+ * the terms of the GNU Lesser General Public License version 3, as published by
926+ * the Free Software Foundation.
927+ *
928+ * This program is distributed in the hope that it will be useful, but WITHOUT
929+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
930+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
931+ * Lesser General Public License for more details.
932+ *
933+ * You should have received a copy of the GNU Lesser General Public License
934+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
935+ */
936+
937 #include "sessionauthorizer.h"
938 #include "logging.h"
939
940
941=== modified file 'src/unity-mir/sessionauthorizer.h'
942--- src/unity-mir/sessionauthorizer.h 2013-08-08 19:32:28 +0000
943+++ src/unity-mir/sessionauthorizer.h 2013-08-09 13:18:43 +0000
944@@ -1,3 +1,19 @@
945+/*
946+ * Copyright (C) 2013 Canonical, Ltd.
947+ *
948+ * This program is free software: you can redistribute it and/or modify it under
949+ * the terms of the GNU Lesser General Public License version 3, as published by
950+ * the Free Software Foundation.
951+ *
952+ * This program is distributed in the hope that it will be useful, but WITHOUT
953+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
954+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
955+ * Lesser General Public License for more details.
956+ *
957+ * You should have received a copy of the GNU Lesser General Public License
958+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
959+ */
960+
961 #ifndef SESSIONAUTHORIZER_H
962 #define SESSIONAUTHORIZER_H
963
964
965=== modified file 'src/unity-mir/sessionlistener.cpp'
966--- src/unity-mir/sessionlistener.cpp 2013-07-24 14:21:44 +0000
967+++ src/unity-mir/sessionlistener.cpp 2013-08-09 13:18:43 +0000
968@@ -1,3 +1,19 @@
969+/*
970+ * Copyright (C) 2013 Canonical, Ltd.
971+ *
972+ * This program is free software: you can redistribute it and/or modify it under
973+ * the terms of the GNU Lesser General Public License version 3, as published by
974+ * the Free Software Foundation.
975+ *
976+ * This program is distributed in the hope that it will be useful, but WITHOUT
977+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
978+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
979+ * Lesser General Public License for more details.
980+ *
981+ * You should have received a copy of the GNU Lesser General Public License
982+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
983+ */
984+
985 #include "sessionlistener.h"
986 #include "logging.h"
987
988
989=== modified file 'src/unity-mir/sessionlistener.h'
990--- src/unity-mir/sessionlistener.h 2013-07-24 16:35:57 +0000
991+++ src/unity-mir/sessionlistener.h 2013-08-09 13:18:43 +0000
992@@ -1,3 +1,19 @@
993+/*
994+ * Copyright (C) 2013 Canonical, Ltd.
995+ *
996+ * This program is free software: you can redistribute it and/or modify it under
997+ * the terms of the GNU Lesser General Public License version 3, as published by
998+ * the Free Software Foundation.
999+ *
1000+ * This program is distributed in the hope that it will be useful, but WITHOUT
1001+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
1002+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1003+ * Lesser General Public License for more details.
1004+ *
1005+ * You should have received a copy of the GNU Lesser General Public License
1006+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1007+ */
1008+
1009 #ifndef SESSIONLISTENER_H
1010 #define SESSIONLISTENER_H
1011
1012
1013=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
1014--- src/unity-mir/shellserverconfiguration.cpp 2013-08-08 13:27:29 +0000
1015+++ src/unity-mir/shellserverconfiguration.cpp 2013-08-09 13:18:43 +0000
1016@@ -1,3 +1,19 @@
1017+/*
1018+ * Copyright (C) 2013 Canonical, Ltd.
1019+ *
1020+ * This program is free software: you can redistribute it and/or modify it under
1021+ * the terms of the GNU Lesser General Public License version 3, as published by
1022+ * the Free Software Foundation.
1023+ *
1024+ * This program is distributed in the hope that it will be useful, but WITHOUT
1025+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
1026+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1027+ * Lesser General Public License for more details.
1028+ *
1029+ * You should have received a copy of the GNU Lesser General Public License
1030+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1031+ */
1032+
1033 #include "shellserverconfiguration.h"
1034
1035 #include "initialsurfaceplacementstrategy.h"
1036
1037=== modified file 'src/unity-mir/shellserverconfiguration.h'
1038--- src/unity-mir/shellserverconfiguration.h 2013-07-24 23:10:02 +0000
1039+++ src/unity-mir/shellserverconfiguration.h 2013-08-09 13:18:43 +0000
1040@@ -1,3 +1,19 @@
1041+/*
1042+ * Copyright (C) 2013 Canonical, Ltd.
1043+ *
1044+ * This program is free software: you can redistribute it and/or modify it under
1045+ * the terms of the GNU Lesser General Public License version 3, as published by
1046+ * the Free Software Foundation.
1047+ *
1048+ * This program is distributed in the hope that it will be useful, but WITHOUT
1049+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
1050+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1051+ * Lesser General Public License for more details.
1052+ *
1053+ * You should have received a copy of the GNU Lesser General Public License
1054+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1055+ */
1056+
1057 #ifndef SHELLSERVERCONFIGURATION_H
1058 #define SHELLSERVERCONFIGURATION_H
1059
1060
1061=== modified file 'src/unity-mir/surfacebuilder.cpp'
1062--- src/unity-mir/surfacebuilder.cpp 2013-07-22 12:27:05 +0000
1063+++ src/unity-mir/surfacebuilder.cpp 2013-08-09 13:18:43 +0000
1064@@ -1,3 +1,19 @@
1065+/*
1066+ * Copyright (C) 2013 Canonical, Ltd.
1067+ *
1068+ * This program is free software: you can redistribute it and/or modify it under
1069+ * the terms of the GNU Lesser General Public License version 3, as published by
1070+ * the Free Software Foundation.
1071+ *
1072+ * This program is distributed in the hope that it will be useful, but WITHOUT
1073+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
1074+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1075+ * Lesser General Public License for more details.
1076+ *
1077+ * You should have received a copy of the GNU Lesser General Public License
1078+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1079+ */
1080+
1081 #include <mir/surfaces/surface_stack_model.h>
1082 #include <mir/shell/surface_creation_parameters.h> // TODO: Remove ~racarr
1083
1084
1085=== modified file 'src/unity-mir/surfacebuilder.h'
1086--- src/unity-mir/surfacebuilder.h 2013-07-22 12:27:05 +0000
1087+++ src/unity-mir/surfacebuilder.h 2013-08-09 13:18:43 +0000
1088@@ -1,3 +1,19 @@
1089+/*
1090+ * Copyright (C) 2013 Canonical, Ltd.
1091+ *
1092+ * This program is free software: you can redistribute it and/or modify it under
1093+ * the terms of the GNU Lesser General Public License version 3, as published by
1094+ * the Free Software Foundation.
1095+ *
1096+ * This program is distributed in the hope that it will be useful, but WITHOUT
1097+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
1098+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1099+ * Lesser General Public License for more details.
1100+ *
1101+ * You should have received a copy of the GNU Lesser General Public License
1102+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1103+ */
1104+
1105 #ifndef SURFACEBUILDER_H
1106 #define SURFACEBUILDER_H
1107
1108
1109=== modified file 'src/unity-mir/surfacesource.cpp'
1110--- src/unity-mir/surfacesource.cpp 2013-08-08 13:27:29 +0000
1111+++ src/unity-mir/surfacesource.cpp 2013-08-09 13:18:43 +0000
1112@@ -1,3 +1,19 @@
1113+/*
1114+ * Copyright (C) 2013 Canonical, Ltd.
1115+ *
1116+ * This program is free software: you can redistribute it and/or modify it under
1117+ * the terms of the GNU Lesser General Public License version 3, as published by
1118+ * the Free Software Foundation.
1119+ *
1120+ * This program is distributed in the hope that it will be useful, but WITHOUT
1121+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
1122+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1123+ * Lesser General Public License for more details.
1124+ *
1125+ * You should have received a copy of the GNU Lesser General Public License
1126+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1127+ */
1128+
1129 // local
1130 #include "surfacesource.h"
1131 #include "logging.h"
1132
1133=== modified file 'src/unity-mir/surfacesource.h'
1134--- src/unity-mir/surfacesource.h 2013-08-08 13:27:29 +0000
1135+++ src/unity-mir/surfacesource.h 2013-08-09 13:18:43 +0000
1136@@ -1,3 +1,19 @@
1137+/*
1138+ * Copyright (C) 2013 Canonical, Ltd.
1139+ *
1140+ * This program is free software: you can redistribute it and/or modify it under
1141+ * the terms of the GNU Lesser General Public License version 3, as published by
1142+ * the Free Software Foundation.
1143+ *
1144+ * This program is distributed in the hope that it will be useful, but WITHOUT
1145+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
1146+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1147+ * Lesser General Public License for more details.
1148+ *
1149+ * You should have received a copy of the GNU Lesser General Public License
1150+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1151+ */
1152+
1153 #ifndef SURFACESOURCE_H
1154 #define SURFACESOURCE_H
1155

Subscribers

People subscribed via source and target branches