Ubuntu Notes app

Merge lp:~mzanetti/reminders-app/fix-compile-warnings into lp:reminders-app

  1. fix-compile-warnings
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 372
Merged at revision: 373
Proposed branch: lp:~mzanetti/reminders-app/fix-compile-warnings
Merge into: lp:reminders-app
Prerequisite: lp:~mzanetti/reminders-app/fix-tags-crash
Diff against target: 279 lines (+46/-36)
8 files modified
3rdParty/libthrift/concurrency/PosixThreadFactory.cpp (+4/-0)
src/libqtevernote/note.cpp (+7/-7)
src/libqtevernote/note.h (+6/-6)
src/libqtevernote/notebook.cpp (+4/-4)
src/libqtevernote/notebook.h (+6/-6)
src/libqtevernote/notesstore.cpp (+9/-3)
src/libqtevernote/tag.cpp (+4/-4)
src/libqtevernote/tag.h (+6/-6)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/fix-compile-warnings
Reviewer Review Type Date Requested Status
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+251826@code.launchpad.net

This proposal supersedes a proposal from 2015-03-04.

Commit message

fix compile warnings

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:372
http://91.189.93.70:8080/job/reminders-app-ci/693/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2235
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2235/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/295
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/114

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

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Definitely better, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '3rdParty/libthrift/concurrency/PosixThreadFactory.cpp'
--- 3rdParty/libthrift/concurrency/PosixThreadFactory.cpp 2015-02-26 00:59:08 +0000
+++ 3rdParty/libthrift/concurrency/PosixThreadFactory.cpp 2015-03-04 20:58:05 +0000
@@ -248,7 +248,11 @@
248 * then pro-rate accordingly.248 * then pro-rate accordingly.
249 */249 */
250 static int toPthreadPriority(POLICY policy, PRIORITY priority) {250 static int toPthreadPriority(POLICY policy, PRIORITY priority) {
251#if defined HAVE_SCHED_GET_PRIORITY_MIN || defined HAVE_SCHED_GET_PRIORITY_MAX
251 int pthread_policy = toPthreadPolicy(policy);252 int pthread_policy = toPthreadPolicy(policy);
253#else
254 (void) policy;
255#endif
252 int min_priority = 0;256 int min_priority = 0;
253 int max_priority = 0;257 int max_priority = 0;
254#ifdef HAVE_SCHED_GET_PRIORITY_MIN258#ifdef HAVE_SCHED_GET_PRIORITY_MIN
255259
=== modified file 'src/libqtevernote/note.cpp'
--- src/libqtevernote/note.cpp 2015-02-28 00:45:09 +0000
+++ src/libqtevernote/note.cpp 2015-03-04 20:58:05 +0000
@@ -34,15 +34,15 @@
3434
35Note::Note(const QString &guid, quint32 updateSequenceNumber, QObject *parent) :35Note::Note(const QString &guid, quint32 updateSequenceNumber, QObject *parent) :
36 QObject(parent),36 QObject(parent),
37 m_deleted(false),
37 m_isSearchResult(false),38 m_isSearchResult(false),
38 m_deleted(false),
39 m_updateSequenceNumber(updateSequenceNumber),39 m_updateSequenceNumber(updateSequenceNumber),
40 m_loading(false),40 m_loading(false),
41 m_loadingHighPriority(false),41 m_loadingHighPriority(false),
42 m_loaded(false),42 m_loaded(false),
43 m_needsContentSync(false),
43 m_syncError(false),44 m_syncError(false),
44 m_conflicting(false),45 m_conflicting(false)
45 m_needsContentSync(false)
46{46{
47 setGuid(guid);47 setGuid(guid);
48 m_cacheFile.setFileName(NotesStore::instance()->storageLocation() + "note-" + guid + ".enml");48 m_cacheFile.setFileName(NotesStore::instance()->storageLocation() + "note-" + guid + ".enml");
@@ -451,12 +451,12 @@
451 }451 }
452}452}
453453
454quint32 Note::updateSequenceNumber() const454qint32 Note::updateSequenceNumber() const
455{455{
456 return m_updateSequenceNumber;456 return m_updateSequenceNumber;
457}457}
458458
459void Note::setUpdateSequenceNumber(quint32 updateSequenceNumber)459void Note::setUpdateSequenceNumber(qint32 updateSequenceNumber)
460{460{
461 if (m_updateSequenceNumber != updateSequenceNumber) {461 if (m_updateSequenceNumber != updateSequenceNumber) {
462 m_updateSequenceNumber = updateSequenceNumber;462 m_updateSequenceNumber = updateSequenceNumber;
@@ -469,12 +469,12 @@
469 }469 }
470}470}
471471
472quint32 Note::lastSyncedSequenceNumber() const472qint32 Note::lastSyncedSequenceNumber() const
473{473{
474 return m_lastSyncedSequenceNumber;474 return m_lastSyncedSequenceNumber;
475}475}
476476
477void Note::setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber)477void Note::setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber)
478{478{
479 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {479 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {
480 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;480 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;
481481
=== modified file 'src/libqtevernote/note.h'
--- src/libqtevernote/note.h 2015-02-27 22:15:02 +0000
+++ src/libqtevernote/note.h 2015-03-04 20:58:05 +0000
@@ -138,8 +138,8 @@
138 bool isSearchResult() const;138 bool isSearchResult() const;
139 void setIsSearchResult(bool isSearchResult);139 void setIsSearchResult(bool isSearchResult);
140140
141 quint32 updateSequenceNumber() const;141 qint32 updateSequenceNumber() const;
142 quint32 lastSyncedSequenceNumber() const;142 qint32 lastSyncedSequenceNumber() const;
143143
144 bool isCached() const;144 bool isCached() const;
145 bool loaded() const;145 bool loaded() const;
@@ -198,8 +198,8 @@
198 void syncToCacheFile();198 void syncToCacheFile();
199 void syncToInfoFile();199 void syncToInfoFile();
200 void deleteFromCache();200 void deleteFromCache();
201 void setUpdateSequenceNumber(quint32 updateSequenceNumber);201 void setUpdateSequenceNumber(qint32 updateSequenceNumber);
202 void setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber);202 void setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber);
203 void setConflicting(bool conflicting);203 void setConflicting(bool conflicting);
204204
205 // const because we want to load on demand in getters. Keep this private!205 // const because we want to load on demand in getters. Keep this private!
@@ -221,8 +221,8 @@
221 bool m_deleted;221 bool m_deleted;
222 bool m_isSearchResult;222 bool m_isSearchResult;
223 QHash<QString, Resource*> m_resources;223 QHash<QString, Resource*> m_resources;
224 quint32 m_updateSequenceNumber;224 qint32 m_updateSequenceNumber;
225 quint32 m_lastSyncedSequenceNumber;225 qint32 m_lastSyncedSequenceNumber;
226 mutable QFile m_cacheFile;226 mutable QFile m_cacheFile;
227 QString m_infoFile;227 QString m_infoFile;
228228
229229
=== modified file 'src/libqtevernote/notebook.cpp'
--- src/libqtevernote/notebook.cpp 2015-03-04 00:23:45 +0000
+++ src/libqtevernote/notebook.cpp 2015-03-04 20:58:05 +0000
@@ -258,12 +258,12 @@
258 return m_syncError;258 return m_syncError;
259}259}
260260
261quint32 Notebook::updateSequenceNumber() const261qint32 Notebook::updateSequenceNumber() const
262{262{
263 return m_updateSequenceNumber;263 return m_updateSequenceNumber;
264}264}
265265
266void Notebook::setUpdateSequenceNumber(quint32 updateSequenceNumber)266void Notebook::setUpdateSequenceNumber(qint32 updateSequenceNumber)
267{267{
268 if (m_updateSequenceNumber != updateSequenceNumber) {268 if (m_updateSequenceNumber != updateSequenceNumber) {
269 m_updateSequenceNumber = updateSequenceNumber;269 m_updateSequenceNumber = updateSequenceNumber;
@@ -273,12 +273,12 @@
273 }273 }
274}274}
275275
276quint32 Notebook::lastSyncedSequenceNumber() const276qint32 Notebook::lastSyncedSequenceNumber() const
277{277{
278 return m_lastSyncedSequenceNumber;278 return m_lastSyncedSequenceNumber;
279}279}
280280
281void Notebook::setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber)281void Notebook::setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber)
282{282{
283 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {283 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {
284 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;284 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;
285285
=== modified file 'src/libqtevernote/notebook.h'
--- src/libqtevernote/notebook.h 2015-03-04 00:23:45 +0000
+++ src/libqtevernote/notebook.h 2015-03-04 20:58:05 +0000
@@ -65,8 +65,8 @@
65 bool isDefaultNotebook() const;65 bool isDefaultNotebook() const;
66 void setIsDefaultNotebook(bool isDefaultNotebook);66 void setIsDefaultNotebook(bool isDefaultNotebook);
6767
68 quint32 updateSequenceNumber() const;68 qint32 updateSequenceNumber() const;
69 quint32 lastSyncedSequenceNumber() const;69 qint32 lastSyncedSequenceNumber() const;
7070
71 bool loading() const;71 bool loading() const;
72 bool synced() const;72 bool synced() const;
@@ -99,15 +99,15 @@
9999
100 void setLoading(bool loading);100 void setLoading(bool loading);
101 void setSyncError(bool syncError);101 void setSyncError(bool syncError);
102 void setUpdateSequenceNumber(quint32 updateSequenceNumber);102 void setUpdateSequenceNumber(qint32 updateSequenceNumber);
103 void setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber);103 void setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber);
104104
105 void syncToInfoFile();105 void syncToInfoFile();
106 void deleteInfoFile();106 void deleteInfoFile();
107107
108private:108private:
109 quint32 m_updateSequenceNumber;109 qint32 m_updateSequenceNumber;
110 quint32 m_lastSyncedSequenceNumber;110 qint32 m_lastSyncedSequenceNumber;
111 QString m_guid;111 QString m_guid;
112 QString m_name;112 QString m_name;
113 bool m_published;113 bool m_published;
114114
=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp 2015-03-04 20:58:05 +0000
+++ src/libqtevernote/notesstore.cpp 2015-03-04 20:58:05 +0000
@@ -272,7 +272,9 @@
272272
273void NotesStore::createNotebook(const QString &name)273void NotesStore::createNotebook(const QString &name)
274{274{
275 Notebook *notebook = new Notebook(QUuid::createUuid().toString().remove(QRegExp("[\{\}]*")), 1, this);275 QString newGuid = QUuid::createUuid().toString();
276 newGuid.remove("{").remove("}");
277 Notebook *notebook = new Notebook(newGuid, 1, this);
276 notebook->setName(name);278 notebook->setName(name);
277 if (m_notebooks.isEmpty()) {279 if (m_notebooks.isEmpty()) {
278 notebook->setIsDefaultNotebook(true);280 notebook->setIsDefaultNotebook(true);
@@ -469,7 +471,9 @@
469471
470Tag* NotesStore::createTag(const QString &name)472Tag* NotesStore::createTag(const QString &name)
471{473{
472 Tag *tag = new Tag(QUuid::createUuid().toString().remove(QRegExp("[\{\}]*")), 1, this);474 QString newGuid = QUuid::createUuid().toString();
475 newGuid.remove("{").remove("}");
476 Tag *tag = new Tag(newGuid, 1, this);
473 tag->setName(name);477 tag->setName(name);
474 m_tags.append(tag);478 m_tags.append(tag);
475 m_tagsHash.insert(tag->guid(), tag);479 m_tagsHash.insert(tag->guid(), tag);
@@ -1132,7 +1136,9 @@
11321136
1133Note* NotesStore::createNote(const QString &title, const QString &notebookGuid, const EnmlDocument &content)1137Note* NotesStore::createNote(const QString &title, const QString &notebookGuid, const EnmlDocument &content)
1134{1138{
1135 Note *note = new Note(QUuid::createUuid().toString().remove(QRegExp("[\{\}]*")), 1, this);1139 QString newGuid = QUuid::createUuid().toString();
1140 newGuid.remove("{").remove("}");
1141 Note *note = new Note(newGuid, 1, this);
1136 connect(note, &Note::reminderChanged, this, &NotesStore::emitDataChanged);1142 connect(note, &Note::reminderChanged, this, &NotesStore::emitDataChanged);
1137 connect(note, &Note::reminderDoneChanged, this, &NotesStore::emitDataChanged);1143 connect(note, &Note::reminderDoneChanged, this, &NotesStore::emitDataChanged);
11381144
11391145
=== modified file 'src/libqtevernote/tag.cpp'
--- src/libqtevernote/tag.cpp 2015-03-04 00:23:45 +0000
+++ src/libqtevernote/tag.cpp 2015-03-04 20:58:05 +0000
@@ -77,12 +77,12 @@
77 emit guidChanged();77 emit guidChanged();
78}78}
7979
80quint32 Tag::updateSequenceNumber() const80qint32 Tag::updateSequenceNumber() const
81{81{
82 return m_updateSequenceNumber;82 return m_updateSequenceNumber;
83}83}
8484
85void Tag::setUpdateSequenceNumber(quint32 updateSequenceNumber)85void Tag::setUpdateSequenceNumber(qint32 updateSequenceNumber)
86{86{
87 if (m_updateSequenceNumber != updateSequenceNumber) {87 if (m_updateSequenceNumber != updateSequenceNumber) {
88 m_updateSequenceNumber = updateSequenceNumber;88 m_updateSequenceNumber = updateSequenceNumber;
@@ -92,12 +92,12 @@
92 }92 }
93}93}
9494
95quint32 Tag::lastSyncedSequenceNumber() const95qint32 Tag::lastSyncedSequenceNumber() const
96{96{
97 return m_lastSyncedSequenceNumber;97 return m_lastSyncedSequenceNumber;
98}98}
9999
100void Tag::setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber)100void Tag::setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber)
101{101{
102 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {102 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {
103 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;103 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;
104104
=== modified file 'src/libqtevernote/tag.h'
--- src/libqtevernote/tag.h 2015-03-04 00:23:45 +0000
+++ src/libqtevernote/tag.h 2015-03-04 20:58:05 +0000
@@ -52,10 +52,10 @@
52 QString guid() const;52 QString guid() const;
53 void setGuid(const QString &guid);53 void setGuid(const QString &guid);
5454
55 quint32 updateSequenceNumber() const;55 qint32 updateSequenceNumber() const;
56 void setUpdateSequenceNumber(quint32 updateSequenceNumber);56 void setUpdateSequenceNumber(qint32 updateSequenceNumber);
5757
58 quint32 lastSyncedSequenceNumber() const;58 qint32 lastSyncedSequenceNumber() const;
5959
60 QString name() const;60 QString name() const;
61 void setName(const QString &guid);61 void setName(const QString &guid);
@@ -86,13 +86,13 @@
86private:86private:
87 void syncToInfoFile();87 void syncToInfoFile();
88 void deleteInfoFile();88 void deleteInfoFile();
89 void setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber);89 void setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber);
90 void setLoading(bool loading);90 void setLoading(bool loading);
91 void setSyncError(bool syncError);91 void setSyncError(bool syncError);
9292
93private:93private:
94 quint32 m_updateSequenceNumber;94 qint32 m_updateSequenceNumber;
95 quint32 m_lastSyncedSequenceNumber;95 qint32 m_lastSyncedSequenceNumber;
96 QString m_guid;96 QString m_guid;
97 QString m_name;97 QString m_name;
9898

Subscribers

People subscribed via source and target branches