for the Seafile cloud storage system.
| user-name-completer.cpp (seafile-client-9.0.1) | : | user-name-completer.cpp (seafile-client-9.0.2) |
|---|
| | |
| skipping to change at line 203 | | skipping to change at line 203 |
|---|
| if (pattern.isEmpty()) { | | if (pattern.isEmpty()) { |
| return; | | return; |
| } | | } |
| | |
| if (cached_completion_users_by_pattern_.contains(pattern) && | | if (cached_completion_users_by_pattern_.contains(pattern) && |
| cached_completion_users_by_pattern_[pattern].ts + | | cached_completion_users_by_pattern_[pattern].ts + |
| kCacheEntryExpireMSecs > | | kCacheEntryExpireMSecs > |
| QDateTime::currentMSecsSinceEpoch()) { | | QDateTime::currentMSecsSinceEpoch()) { |
| // printf("cached results for %s\n", pattern.toUtf8().data()); | | // printf("cached results for %s\n", pattern.toUtf8().data()); |
| showCompletion( | | showCompletion( |
|
| | #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) |
| cached_completion_users_by_pattern_[pattern].users.values(), pattern
); | | cached_completion_users_by_pattern_[pattern].users.values(), pattern
); |
|
| | #else |
| | cached_completion_users_by_pattern_[pattern].users.toList(), pattern |
| | ); |
| | #endif |
| return; | | return; |
| } | | } |
| | |
| if (in_progress_search_requests_.contains(pattern)) { | | if (in_progress_search_requests_.contains(pattern)) { |
| // printf("already a request for %s\n", pattern.toUtf8().data()); | | // printf("already a request for %s\n", pattern.toUtf8().data()); |
| return; | | return; |
| } | | } |
| | |
| // printf("request completions for username %s\n", pattern.toUtf8().data()); | | // printf("request completions for username %s\n", pattern.toUtf8().data()); |
| SearchUsersRequest *req = new SearchUsersRequest(account_, pattern); | | SearchUsersRequest *req = new SearchUsersRequest(account_, pattern); |
| | |
| skipping to change at line 245 | | skipping to change at line 249 |
|---|
| { | | { |
| SearchUsersRequest *req = qobject_cast<SearchUsersRequest *>(sender()); | | SearchUsersRequest *req = qobject_cast<SearchUsersRequest *>(sender()); |
| in_progress_search_requests_.remove(req->pattern()); | | in_progress_search_requests_.remove(req->pattern()); |
| req->deleteLater(); | | req->deleteLater(); |
| | |
| // printf("get %d results for pattern %s\n", | | // printf("get %d results for pattern %s\n", |
| // users.size(), | | // users.size(), |
| // req->pattern().toUtf8().data()); | | // req->pattern().toUtf8().data()); |
| | |
| cached_completion_users_by_pattern_[req->pattern()] = { | | cached_completion_users_by_pattern_[req->pattern()] = { |
|
| | #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) |
| QSet<SeafileUser>(users.begin(), users.end()), | | QSet<SeafileUser>(users.begin(), users.end()), |
|
| | #else |
| | QSet<SeafileUser>::fromList(users), |
| | #endif |
| QDateTime::currentMSecsSinceEpoch()}; | | QDateTime::currentMSecsSinceEpoch()}; |
| showCompletion(users, req->pattern()); | | showCompletion(users, req->pattern()); |
| } | | } |
| | |
| void SeafileUserNameCompleter::onSearchUsersFailed(const ApiError &error) | | void SeafileUserNameCompleter::onSearchUsersFailed(const ApiError &error) |
| { | | { |
| SearchUsersRequest *req = qobject_cast<SearchUsersRequest *>(sender()); | | SearchUsersRequest *req = qobject_cast<SearchUsersRequest *>(sender()); |
| in_progress_search_requests_.remove(req->pattern()); | | in_progress_search_requests_.remove(req->pattern()); |
| req->deleteLater(); | | req->deleteLater(); |
| } | | } |
| | | |
| End of changes. 4 change blocks. |
|---|
| 0 lines changed or deleted | | 9 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 