diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-05-03 20:11:59 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-05-03 20:11:59 +0200 |
commit | b738f46f95761072943610e050da314a6fda5fa9 (patch) | |
tree | 1fea6f39c95504655b20647fdf9e6712e8fb59d2 | |
parent | c14f07a865940de86b229b4eba0d3bbb9b13967c (diff) | |
download | sink-b738f46f95761072943610e050da314a6fda5fa9.tar.gz sink-b738f46f95761072943610e050da314a6fda5fa9.zip |
The folder specialpurpose field
-rw-r--r-- | common/domain/folder.cpp | 3 | ||||
-rw-r--r-- | common/domain/folder.fbs | 1 | ||||
-rw-r--r-- | common/query.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp index 1cb9217..98e2257 100644 --- a/common/domain/folder.cpp +++ b/common/domain/folder.cpp | |||
@@ -73,6 +73,7 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Folder>::Buffer> > TypeImpl | |||
73 | propertyMapper->addMapping<QByteArray, Buffer>("parent", &Buffer::parent); | 73 | propertyMapper->addMapping<QByteArray, Buffer>("parent", &Buffer::parent); |
74 | propertyMapper->addMapping<QString, Buffer>("name", &Buffer::name); | 74 | propertyMapper->addMapping<QString, Buffer>("name", &Buffer::name); |
75 | propertyMapper->addMapping<QByteArray, Buffer>("icon", &Buffer::icon); | 75 | propertyMapper->addMapping<QByteArray, Buffer>("icon", &Buffer::icon); |
76 | propertyMapper->addMapping<QByteArrayList, Buffer>("specialpurpose", &Buffer::specialpurpose); | ||
76 | return propertyMapper; | 77 | return propertyMapper; |
77 | } | 78 | } |
78 | 79 | ||
@@ -81,6 +82,6 @@ QSharedPointer<WritePropertyMapper<TypeImplementation<Folder>::BufferBuilder> > | |||
81 | auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create(); | 82 | auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create(); |
82 | propertyMapper->addMapping<QByteArray>("parent", &BufferBuilder::add_parent); | 83 | propertyMapper->addMapping<QByteArray>("parent", &BufferBuilder::add_parent); |
83 | propertyMapper->addMapping<QString>("name", &BufferBuilder::add_name); | 84 | propertyMapper->addMapping<QString>("name", &BufferBuilder::add_name); |
84 | propertyMapper->addMapping<QByteArray>("icon", &BufferBuilder::add_icon); | 85 | propertyMapper->addMapping<QByteArrayList>("specialpurpose", &BufferBuilder::add_specialpurpose); |
85 | return propertyMapper; | 86 | return propertyMapper; |
86 | } | 87 | } |
diff --git a/common/domain/folder.fbs b/common/domain/folder.fbs index b5d01ef..5d0ebfa 100644 --- a/common/domain/folder.fbs +++ b/common/domain/folder.fbs | |||
@@ -4,6 +4,7 @@ table Folder { | |||
4 | name:string; | 4 | name:string; |
5 | parent:string; | 5 | parent:string; |
6 | icon:string; | 6 | icon:string; |
7 | specialpurpose:[string]; | ||
7 | } | 8 | } |
8 | 9 | ||
9 | root_type Folder; | 10 | root_type Folder; |
diff --git a/common/query.cpp b/common/query.cpp index a80aecb..eeacd69 100644 --- a/common/query.cpp +++ b/common/query.cpp | |||
@@ -48,7 +48,7 @@ bool Query::Comparator::matches(const QVariant &v) const | |||
48 | case Equals: | 48 | case Equals: |
49 | return v == value; | 49 | return v == value; |
50 | case Contains: | 50 | case Contains: |
51 | return v.toList().contains(value); | 51 | return v.value<QByteArrayList>().contains(value.toByteArray()); |
52 | default: | 52 | default: |
53 | break; | 53 | break; |
54 | } | 54 | } |