diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-02-28 18:28:34 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-02-28 18:28:34 +0100 |
commit | 32a901b7860516d3e24dd72d76e2a4c483d71b54 (patch) | |
tree | 487a9440485121aff1ab777ac47e515446e131d7 /examples/imapresource/imapresource.cpp | |
parent | 6a73a9c405473725ae7d7159e1f88ad54c10448c (diff) | |
download | sink-32a901b7860516d3e24dd72d76e2a4c483d71b54.tar.gz sink-32a901b7860516d3e24dd72d76e2a4c483d71b54.zip |
Cleanup
Diffstat (limited to 'examples/imapresource/imapresource.cpp')
-rw-r--r-- | examples/imapresource/imapresource.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp index e8bc903..5f7304d 100644 --- a/examples/imapresource/imapresource.cpp +++ b/examples/imapresource/imapresource.cpp | |||
@@ -145,19 +145,23 @@ public: | |||
145 | return remoteId; | 145 | return remoteId; |
146 | } | 146 | } |
147 | 147 | ||
148 | static bool contains(const QVector<Folder> &folderList, const QByteArray &remoteId) | ||
149 | { | ||
150 | for (const auto &folder : folderList) { | ||
151 | if (folderRid(folder) == remoteId) { | ||
152 | return true; | ||
153 | } | ||
154 | } | ||
155 | return false; | ||
156 | } | ||
157 | |||
148 | void synchronizeFolders(const QVector<Folder> &folderList) | 158 | void synchronizeFolders(const QVector<Folder> &folderList) |
149 | { | 159 | { |
150 | SinkTraceCtx(mLogCtx) << "Found folders " << folderList.size(); | 160 | SinkTraceCtx(mLogCtx) << "Found folders " << folderList.size(); |
151 | 161 | ||
152 | scanForRemovals(ENTITY_TYPE_FOLDER, | 162 | scanForRemovals(ENTITY_TYPE_FOLDER, |
153 | [&folderList](const QByteArray &remoteId) -> bool { | 163 | [&folderList](const QByteArray &remoteId) -> bool { |
154 | // folderList.contains(remoteId) | 164 | return contains(folderList, remoteId); |
155 | for (const auto &folder : folderList) { | ||
156 | if (folderRid(folder) == remoteId) { | ||
157 | return true; | ||
158 | } | ||
159 | } | ||
160 | return false; | ||
161 | } | 165 | } |
162 | ); | 166 | ); |
163 | 167 | ||
@@ -949,7 +953,7 @@ protected: | |||
949 | *folderByPath << f.path(); | 953 | *folderByPath << f.path(); |
950 | *folderByName << f.name(); | 954 | *folderByName << f.name(); |
951 | })) | 955 | })) |
952 | .then([this, folderByName, folderByPath, folder, remoteId, imap] { | 956 | .then([folderByName, folderByPath, folder, remoteId, imap] { |
953 | if (!folderByName->contains(folder.getName())) { | 957 | if (!folderByName->contains(folder.getName())) { |
954 | SinkWarning() << "Existing folders are: " << *folderByPath; | 958 | SinkWarning() << "Existing folders are: " << *folderByPath; |
955 | SinkWarning() << "We're looking for: " << folder.getName(); | 959 | SinkWarning() << "We're looking for: " << folder.getName(); |