← Back to branch summary

~mterry/unity-scopes-api/snap-root

« back to all changes in this revision

Viewing changes to src/scopes/internal/ResultReplyObject.cpp

  • Committer: CI Train Bot
  • Author(s): Pawel Stolowski
  • Date: 2016-03-17 22:35:14 UTC
  • mfrom: (261.1.54 staging)
  • Revision ID: ci-train-bot@canonical.com-20160317223514-dxndlxrg5jbi2oqk
Merged devel: use abigail for abi-compoliance checker (disabled for now due o abigail bugs); filters API changes.
Approved by: Michi Henning, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scopes/internal/ResultReplyObject.cpp
24
24
#include <unity/scopes/internal/CategorisedResultImpl.h>
25
25
#include <unity/scopes/internal/DepartmentImpl.h>
26
26
#include <unity/scopes/FilterBase.h>
 
27
#include <unity/scopes/internal/FilterGroupImpl.h>
27
28
#include <unity/scopes/internal/FilterBaseImpl.h>
28
29
#include <unity/scopes/internal/FilterStateImpl.h>
29
30
#include <unity/UnityExceptions.h>
65
66
    auto it = data.find("filters");
66
67
    if (it != data.end())
67
68
    {
68
 
        Filters const filters = FilterBaseImpl::deserialize_filters(it->second.get_array());
 
69
        auto itgr = data.find("filter_groups");
 
70
        std::map<std::string, FilterGroup::SCPtr> groups;
 
71
        if (itgr != data.end())
 
72
        {
 
73
            groups = FilterGroupImpl::deserialize_filter_groups(itgr->second.get_array());
 
74
        }
 
75
 
 
76
        Filters const filters = FilterBaseImpl::deserialize_filters(it->second.get_array(), groups);
69
77
        it = data.find("filter_state");
70
78
        if (it != data.end())
71
79
        {