Ubuntu Notes app

Merge lp:~mzanetti/reminders-app/more-copyright-header-fixes into lp:reminders-app

  1. more-copyright-header-fixes
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: David Planella
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~mzanetti/reminders-app/more-copyright-header-fixes
Merge into: lp:reminders-app
Prerequisite: lp:~mzanetti/reminders-app/add-reminders
Diff against target: 418 lines (+300/-0)
15 files modified
src/plugin/Evernote/jobs/createnotejob.h (+20/-0)
src/plugin/Evernote/jobs/deletenotejob.h (+20/-0)
src/plugin/Evernote/jobs/evernotejob.h (+20/-0)
src/plugin/Evernote/jobs/fetchnotebooksjob.h (+20/-0)
src/plugin/Evernote/jobs/fetchnotejob.h (+20/-0)
src/plugin/Evernote/jobs/fetchnotesjob.h (+20/-0)
src/plugin/Evernote/jobs/savenotejob.h (+20/-0)
src/plugin/Evernote/note.h (+20/-0)
src/plugin/Evernote/notebook.h (+20/-0)
src/plugin/Evernote/notebooks.h (+20/-0)
src/plugin/Evernote/notes.h (+20/-0)
src/plugin/Evernote/notesstore.h (+20/-0)
src/plugin/Evernote/userstore.h (+20/-0)
src/plugin/Evernote/utils/html2enmlconverter.cpp (+20/-0)
src/plugin/Evernote/utils/html2enmlconverter.h (+20/-0)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/more-copyright-header-fixes
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+197263@code.launchpad.net

Commit message

do a second round of copyright header fixes as apparently I forgot .h files last time

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:19
http://91.189.93.70:8080/job/reminders-app-ci/32/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/318
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/32
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/32

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/32/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/14/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/509/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-autolanding/14
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/14

review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Trivial change, looks good to me.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/plugin/Evernote/jobs/createnotejob.h'
--- src/plugin/Evernote/jobs/createnotejob.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/jobs/createnotejob.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef CREATENOTEJOB_H21#ifndef CREATENOTEJOB_H
2#define CREATENOTEJOB_H22#define CREATENOTEJOB_H
323
424
=== modified file 'src/plugin/Evernote/jobs/deletenotejob.h'
--- src/plugin/Evernote/jobs/deletenotejob.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/jobs/deletenotejob.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef DELETENOTEJOB_H21#ifndef DELETENOTEJOB_H
2#define DELETENOTEJOB_H22#define DELETENOTEJOB_H
323
424
=== modified file 'src/plugin/Evernote/jobs/evernotejob.h'
--- src/plugin/Evernote/jobs/evernotejob.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/jobs/evernotejob.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef EVERNOTEJOB_H21#ifndef EVERNOTEJOB_H
2#define EVERNOTEJOB_H22#define EVERNOTEJOB_H
323
424
=== modified file 'src/plugin/Evernote/jobs/fetchnotebooksjob.h'
--- src/plugin/Evernote/jobs/fetchnotebooksjob.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/jobs/fetchnotebooksjob.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef FETCHNOTEBOOKSJOB_H21#ifndef FETCHNOTEBOOKSJOB_H
2#define FETCHNOTEBOOKSJOB_H22#define FETCHNOTEBOOKSJOB_H
323
424
=== modified file 'src/plugin/Evernote/jobs/fetchnotejob.h'
--- src/plugin/Evernote/jobs/fetchnotejob.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef FETCHNOTEJOB_H21#ifndef FETCHNOTEJOB_H
2#define FETCHNOTEJOB_H22#define FETCHNOTEJOB_H
323
424
=== modified file 'src/plugin/Evernote/jobs/fetchnotesjob.h'
--- src/plugin/Evernote/jobs/fetchnotesjob.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef FETCHNOTESJOB_H21#ifndef FETCHNOTESJOB_H
2#define FETCHNOTESJOB_H22#define FETCHNOTESJOB_H
323
424
=== modified file 'src/plugin/Evernote/jobs/savenotejob.h'
--- src/plugin/Evernote/jobs/savenotejob.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/jobs/savenotejob.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef SAVENOTEJOB_H21#ifndef SAVENOTEJOB_H
2#define SAVENOTEJOB_H22#define SAVENOTEJOB_H
323
424
=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/note.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef NOTE_H21#ifndef NOTE_H
2#define NOTE_H22#define NOTE_H
323
424
=== modified file 'src/plugin/Evernote/notebook.h'
--- src/plugin/Evernote/notebook.h 2013-11-24 17:03:28 +0000
+++ src/plugin/Evernote/notebook.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef NOTEBOOK_H21#ifndef NOTEBOOK_H
2#define NOTEBOOK_H22#define NOTEBOOK_H
323
424
=== modified file 'src/plugin/Evernote/notebooks.h'
--- src/plugin/Evernote/notebooks.h 2013-11-24 17:03:28 +0000
+++ src/plugin/Evernote/notebooks.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef NOTEBOOKS_H21#ifndef NOTEBOOKS_H
2#define NOTEBOOKS_H22#define NOTEBOOKS_H
323
424
=== modified file 'src/plugin/Evernote/notes.h'
--- src/plugin/Evernote/notes.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/notes.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef NOTES_H21#ifndef NOTES_H
2#define NOTES_H22#define NOTES_H
323
424
=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/notesstore.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef NOTESSTORE_H21#ifndef NOTESSTORE_H
2#define NOTESSTORE_H22#define NOTESSTORE_H
323
424
=== modified file 'src/plugin/Evernote/userstore.h'
--- src/plugin/Evernote/userstore.h 2013-11-29 21:01:02 +0000
+++ src/plugin/Evernote/userstore.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef USERSTORE_H21#ifndef USERSTORE_H
2#define USERSTORE_H22#define USERSTORE_H
323
424
=== modified file 'src/plugin/Evernote/utils/html2enmlconverter.cpp'
--- src/plugin/Evernote/utils/html2enmlconverter.cpp 2013-11-25 19:06:38 +0000
+++ src/plugin/Evernote/utils/html2enmlconverter.cpp 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#include "html2enmlconverter.h"21#include "html2enmlconverter.h"
222
3#include <QXmlStreamReader>23#include <QXmlStreamReader>
424
=== modified file 'src/plugin/Evernote/utils/html2enmlconverter.h'
--- src/plugin/Evernote/utils/html2enmlconverter.h 2013-11-25 19:06:38 +0000
+++ src/plugin/Evernote/utils/html2enmlconverter.h 2013-11-29 21:01:02 +0000
@@ -1,3 +1,23 @@
1/*
2 * Copyright: 2013 Canonical, Ltd
3 *
4 * This file is part of reminders-app
5 *
6 * reminders-app is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * reminders-app is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 *
18 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
19 */
20
1#ifndef HTML2ENMLCONVERTER_H21#ifndef HTML2ENMLCONVERTER_H
2#define HTML2ENMLCONVERTER_H22#define HTML2ENMLCONVERTER_H
323

Subscribers

People subscribed via source and target branches