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
1=== modified file '3rdParty/libthrift/concurrency/PosixThreadFactory.cpp'
2--- 3rdParty/libthrift/concurrency/PosixThreadFactory.cpp 2015-02-26 00:59:08 +0000
3+++ 3rdParty/libthrift/concurrency/PosixThreadFactory.cpp 2015-03-04 20:58:05 +0000
4@@ -248,7 +248,11 @@
5 * then pro-rate accordingly.
6 */
7 static int toPthreadPriority(POLICY policy, PRIORITY priority) {
8+#if defined HAVE_SCHED_GET_PRIORITY_MIN || defined HAVE_SCHED_GET_PRIORITY_MAX
9 int pthread_policy = toPthreadPolicy(policy);
10+#else
11+ (void) policy;
12+#endif
13 int min_priority = 0;
14 int max_priority = 0;
15 #ifdef HAVE_SCHED_GET_PRIORITY_MIN
16
17=== modified file 'src/libqtevernote/note.cpp'
18--- src/libqtevernote/note.cpp 2015-02-28 00:45:09 +0000
19+++ src/libqtevernote/note.cpp 2015-03-04 20:58:05 +0000
20@@ -34,15 +34,15 @@
21
22 Note::Note(const QString &guid, quint32 updateSequenceNumber, QObject *parent) :
23 QObject(parent),
24+ m_deleted(false),
25 m_isSearchResult(false),
26- m_deleted(false),
27 m_updateSequenceNumber(updateSequenceNumber),
28 m_loading(false),
29 m_loadingHighPriority(false),
30 m_loaded(false),
31+ m_needsContentSync(false),
32 m_syncError(false),
33- m_conflicting(false),
34- m_needsContentSync(false)
35+ m_conflicting(false)
36 {
37 setGuid(guid);
38 m_cacheFile.setFileName(NotesStore::instance()->storageLocation() + "note-" + guid + ".enml");
39@@ -451,12 +451,12 @@
40 }
41 }
42
43-quint32 Note::updateSequenceNumber() const
44+qint32 Note::updateSequenceNumber() const
45 {
46 return m_updateSequenceNumber;
47 }
48
49-void Note::setUpdateSequenceNumber(quint32 updateSequenceNumber)
50+void Note::setUpdateSequenceNumber(qint32 updateSequenceNumber)
51 {
52 if (m_updateSequenceNumber != updateSequenceNumber) {
53 m_updateSequenceNumber = updateSequenceNumber;
54@@ -469,12 +469,12 @@
55 }
56 }
57
58-quint32 Note::lastSyncedSequenceNumber() const
59+qint32 Note::lastSyncedSequenceNumber() const
60 {
61 return m_lastSyncedSequenceNumber;
62 }
63
64-void Note::setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber)
65+void Note::setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber)
66 {
67 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {
68 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;
69
70=== modified file 'src/libqtevernote/note.h'
71--- src/libqtevernote/note.h 2015-02-27 22:15:02 +0000
72+++ src/libqtevernote/note.h 2015-03-04 20:58:05 +0000
73@@ -138,8 +138,8 @@
74 bool isSearchResult() const;
75 void setIsSearchResult(bool isSearchResult);
76
77- quint32 updateSequenceNumber() const;
78- quint32 lastSyncedSequenceNumber() const;
79+ qint32 updateSequenceNumber() const;
80+ qint32 lastSyncedSequenceNumber() const;
81
82 bool isCached() const;
83 bool loaded() const;
84@@ -198,8 +198,8 @@
85 void syncToCacheFile();
86 void syncToInfoFile();
87 void deleteFromCache();
88- void setUpdateSequenceNumber(quint32 updateSequenceNumber);
89- void setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber);
90+ void setUpdateSequenceNumber(qint32 updateSequenceNumber);
91+ void setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber);
92 void setConflicting(bool conflicting);
93
94 // const because we want to load on demand in getters. Keep this private!
95@@ -221,8 +221,8 @@
96 bool m_deleted;
97 bool m_isSearchResult;
98 QHash<QString, Resource*> m_resources;
99- quint32 m_updateSequenceNumber;
100- quint32 m_lastSyncedSequenceNumber;
101+ qint32 m_updateSequenceNumber;
102+ qint32 m_lastSyncedSequenceNumber;
103 mutable QFile m_cacheFile;
104 QString m_infoFile;
105
106
107=== modified file 'src/libqtevernote/notebook.cpp'
108--- src/libqtevernote/notebook.cpp 2015-03-04 00:23:45 +0000
109+++ src/libqtevernote/notebook.cpp 2015-03-04 20:58:05 +0000
110@@ -258,12 +258,12 @@
111 return m_syncError;
112 }
113
114-quint32 Notebook::updateSequenceNumber() const
115+qint32 Notebook::updateSequenceNumber() const
116 {
117 return m_updateSequenceNumber;
118 }
119
120-void Notebook::setUpdateSequenceNumber(quint32 updateSequenceNumber)
121+void Notebook::setUpdateSequenceNumber(qint32 updateSequenceNumber)
122 {
123 if (m_updateSequenceNumber != updateSequenceNumber) {
124 m_updateSequenceNumber = updateSequenceNumber;
125@@ -273,12 +273,12 @@
126 }
127 }
128
129-quint32 Notebook::lastSyncedSequenceNumber() const
130+qint32 Notebook::lastSyncedSequenceNumber() const
131 {
132 return m_lastSyncedSequenceNumber;
133 }
134
135-void Notebook::setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber)
136+void Notebook::setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber)
137 {
138 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {
139 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;
140
141=== modified file 'src/libqtevernote/notebook.h'
142--- src/libqtevernote/notebook.h 2015-03-04 00:23:45 +0000
143+++ src/libqtevernote/notebook.h 2015-03-04 20:58:05 +0000
144@@ -65,8 +65,8 @@
145 bool isDefaultNotebook() const;
146 void setIsDefaultNotebook(bool isDefaultNotebook);
147
148- quint32 updateSequenceNumber() const;
149- quint32 lastSyncedSequenceNumber() const;
150+ qint32 updateSequenceNumber() const;
151+ qint32 lastSyncedSequenceNumber() const;
152
153 bool loading() const;
154 bool synced() const;
155@@ -99,15 +99,15 @@
156
157 void setLoading(bool loading);
158 void setSyncError(bool syncError);
159- void setUpdateSequenceNumber(quint32 updateSequenceNumber);
160- void setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber);
161+ void setUpdateSequenceNumber(qint32 updateSequenceNumber);
162+ void setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber);
163
164 void syncToInfoFile();
165 void deleteInfoFile();
166
167 private:
168- quint32 m_updateSequenceNumber;
169- quint32 m_lastSyncedSequenceNumber;
170+ qint32 m_updateSequenceNumber;
171+ qint32 m_lastSyncedSequenceNumber;
172 QString m_guid;
173 QString m_name;
174 bool m_published;
175
176=== modified file 'src/libqtevernote/notesstore.cpp'
177--- src/libqtevernote/notesstore.cpp 2015-03-04 20:58:05 +0000
178+++ src/libqtevernote/notesstore.cpp 2015-03-04 20:58:05 +0000
179@@ -272,7 +272,9 @@
180
181 void NotesStore::createNotebook(const QString &name)
182 {
183- Notebook *notebook = new Notebook(QUuid::createUuid().toString().remove(QRegExp("[\{\}]*")), 1, this);
184+ QString newGuid = QUuid::createUuid().toString();
185+ newGuid.remove("{").remove("}");
186+ Notebook *notebook = new Notebook(newGuid, 1, this);
187 notebook->setName(name);
188 if (m_notebooks.isEmpty()) {
189 notebook->setIsDefaultNotebook(true);
190@@ -469,7 +471,9 @@
191
192 Tag* NotesStore::createTag(const QString &name)
193 {
194- Tag *tag = new Tag(QUuid::createUuid().toString().remove(QRegExp("[\{\}]*")), 1, this);
195+ QString newGuid = QUuid::createUuid().toString();
196+ newGuid.remove("{").remove("}");
197+ Tag *tag = new Tag(newGuid, 1, this);
198 tag->setName(name);
199 m_tags.append(tag);
200 m_tagsHash.insert(tag->guid(), tag);
201@@ -1132,7 +1136,9 @@
202
203 Note* NotesStore::createNote(const QString &title, const QString &notebookGuid, const EnmlDocument &content)
204 {
205- Note *note = new Note(QUuid::createUuid().toString().remove(QRegExp("[\{\}]*")), 1, this);
206+ QString newGuid = QUuid::createUuid().toString();
207+ newGuid.remove("{").remove("}");
208+ Note *note = new Note(newGuid, 1, this);
209 connect(note, &Note::reminderChanged, this, &NotesStore::emitDataChanged);
210 connect(note, &Note::reminderDoneChanged, this, &NotesStore::emitDataChanged);
211
212
213=== modified file 'src/libqtevernote/tag.cpp'
214--- src/libqtevernote/tag.cpp 2015-03-04 00:23:45 +0000
215+++ src/libqtevernote/tag.cpp 2015-03-04 20:58:05 +0000
216@@ -77,12 +77,12 @@
217 emit guidChanged();
218 }
219
220-quint32 Tag::updateSequenceNumber() const
221+qint32 Tag::updateSequenceNumber() const
222 {
223 return m_updateSequenceNumber;
224 }
225
226-void Tag::setUpdateSequenceNumber(quint32 updateSequenceNumber)
227+void Tag::setUpdateSequenceNumber(qint32 updateSequenceNumber)
228 {
229 if (m_updateSequenceNumber != updateSequenceNumber) {
230 m_updateSequenceNumber = updateSequenceNumber;
231@@ -92,12 +92,12 @@
232 }
233 }
234
235-quint32 Tag::lastSyncedSequenceNumber() const
236+qint32 Tag::lastSyncedSequenceNumber() const
237 {
238 return m_lastSyncedSequenceNumber;
239 }
240
241-void Tag::setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber)
242+void Tag::setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber)
243 {
244 if (m_lastSyncedSequenceNumber != lastSyncedSequenceNumber) {
245 m_lastSyncedSequenceNumber = lastSyncedSequenceNumber;
246
247=== modified file 'src/libqtevernote/tag.h'
248--- src/libqtevernote/tag.h 2015-03-04 00:23:45 +0000
249+++ src/libqtevernote/tag.h 2015-03-04 20:58:05 +0000
250@@ -52,10 +52,10 @@
251 QString guid() const;
252 void setGuid(const QString &guid);
253
254- quint32 updateSequenceNumber() const;
255- void setUpdateSequenceNumber(quint32 updateSequenceNumber);
256+ qint32 updateSequenceNumber() const;
257+ void setUpdateSequenceNumber(qint32 updateSequenceNumber);
258
259- quint32 lastSyncedSequenceNumber() const;
260+ qint32 lastSyncedSequenceNumber() const;
261
262 QString name() const;
263 void setName(const QString &guid);
264@@ -86,13 +86,13 @@
265 private:
266 void syncToInfoFile();
267 void deleteInfoFile();
268- void setLastSyncedSequenceNumber(quint32 lastSyncedSequenceNumber);
269+ void setLastSyncedSequenceNumber(qint32 lastSyncedSequenceNumber);
270 void setLoading(bool loading);
271 void setSyncError(bool syncError);
272
273 private:
274- quint32 m_updateSequenceNumber;
275- quint32 m_lastSyncedSequenceNumber;
276+ qint32 m_updateSequenceNumber;
277+ qint32 m_lastSyncedSequenceNumber;
278 QString m_guid;
279 QString m_name;
280

Subscribers

People subscribed via source and target branches