Skip to content

Commit 146de33

Browse files
committed
fixes after review
1 parent 2c364ea commit 146de33

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

+nix/MetadataMixIn.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
classdef MetadataMixIn < handle
22
%MetadataMixIn
33
% mixin class for nix entities with metadata
4-
4+
% depends on
5+
% - nix.Entity
6+
57
properties(Hidden)
68
metadataCache
79
end;

+nix/SourcesMixIn.m

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
classdef SourcesMixIn < handle
22
%SourcesMixIn
33
% mixin class for nix entities that can be related with sources
4+
% depends on
5+
% - nix.Entity
6+
% - nix.Dynamic
7+
8+
properties (Abstract, Access = protected)
9+
alias
10+
end
411

512
methods
613
function obj = SourcesMixIn()
@@ -9,17 +16,20 @@
916

1017
function [] = add_source(obj, add_this)
1118
obj.sourcesCache = nix.Utils.add_entity(obj, ...
12-
add_this, 'nix.Source', 'Tag::addSource', obj.sourcesCache);
19+
add_this, 'nix.Source', ...
20+
strcat(obj.alias, '::addSource'), obj.sourcesCache);
1321
end;
1422

1523
function delCheck = remove_source(obj, del)
1624
[delCheck, obj.sourcesCache] = nix.Utils.delete_entity(obj, ...
17-
del, 'nix.Source', 'Tag::removeSource', obj.sourcesCache);
25+
del, 'nix.Source', strcat(obj.alias, '::removeSource'), ...
26+
obj.sourcesCache);
1827
end;
1928

2029
function retObj = open_source(obj, id_or_name)
2130
retObj = nix.Utils.open_entity(obj, ...
22-
'Tag::openSource', id_or_name, @nix.Source);
31+
strcat(obj.alias, '::openSource'), id_or_name, ...
32+
@nix.Source);
2333
end;
2434
end
2535

nix_mx.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static void on_exit() {
5555
}
5656

5757
#define GETTER(type, class, name) static_cast<type(class::*)()const>(&class::name)
58-
#define SETTER(type, class, name) static_cast<void(class::*)(type)>(&class::name)
58+
//#define SETTER(type, class, name) static_cast<void(class::*)(type)>(&class::name)
5959
#define GETBYSTR(type, class, name) static_cast<type(class::*)(const std::string &)const>(&class::name)
6060
#define GETCONTENT(type, class, name) static_cast<type(class::*)()const>(&class::name)
6161
#define GETSOURCES(base__) static_cast<std::vector<nix::Source>(nix::base::EntityWithSources<nix::base::base__>::*)(std::function<bool(const nix::Source &)>)const>(&nix::base::EntityWithSources<nix::base::base__>::sources)

0 commit comments

Comments
 (0)