debian-packages/ddbus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Deprecate ddbus.util.isVariant

Browse source 
Closes #22
This commit is contained in:
Harry T. Vennik 2017-08-14 20:25:31 +02:00
parent e6d03252d2
commit e4186bcc5c
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/ddbus/conv.d
View file

@ -122,7 +122,7 @@ void buildIter(TS...)(DBusMessageIter *iter, TS args) if(allCanDBus!TS) {
}
if(val.explicitVariant)
dbus_message_iter_close_container(iter, sub);
} else static if(isVariant!T) {
} else static if(isInstanceOf!(Variant, T)) {
DBusMessageIter sub;
const(char)* subSig = typeSig!(VariantType!T).toStringz();
dbus_message_iter_open_container(iter, 'v', subSig, &sub);
@ -188,7 +188,7 @@ T readIter(T)(DBusMessageIter *iter) if (!is(T == enum) && !isInstanceOf!(BitFla
auto argType = dbus_message_iter_get_arg_type(iter);
T ret;
static if(!isVariant!T || is(T == Variant!DBusAny)) {
static if(!isInstanceOf!(Variant, T) || is(T == Variant!DBusAny)) {
if(argType == 'v') {
DBusMessageIter sub;
dbus_message_iter_recurse(iter, &sub);
@ -242,7 +242,7 @@ T readIter(T)(DBusMessageIter *iter) if (!is(T == enum) && !isInstanceOf!(BitFla
ret ~= readIter!U(&sub);
}
}
} else static if(isVariant!T) {
} else static if(isInstanceOf!(Variant, T)) {
DBusMessageIter sub;
dbus_message_iter_recurse(iter, &sub);
ret.data = readIter!(VariantType!T)(&sub);