|
|
@ -55,7 +55,7 @@ Message::iterator::iterator( DBusMessage* msg )
|
|
|
|
d->iter = static_cast<DBusMessageIter *>( malloc( sizeof(DBusMessageIter) ) );
|
|
|
|
d->iter = static_cast<DBusMessageIter *>( malloc( sizeof(DBusMessageIter) ) );
|
|
|
|
dbus_message_iter_init( d->mesg, d->iter );
|
|
|
|
dbus_message_iter_init( d->mesg, d->iter );
|
|
|
|
if ( !d->iter ) {
|
|
|
|
if ( !d->iter ) {
|
|
|
|
qDebug("No iterator??");
|
|
|
|
tqDebug("No iterator??");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fillVar();
|
|
|
|
fillVar();
|
|
|
|
d->end = false;
|
|
|
|
d->end = false;
|
|
|
@ -249,7 +249,7 @@ Message::iterator::fillVar()
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
qDebug( "Array of type not implemented" );
|
|
|
|
tqDebug( "Array of type not implemented" );
|
|
|
|
d->var = TQVariant();
|
|
|
|
d->var = TQVariant();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -261,7 +261,7 @@ Message::iterator::fillVar()
|
|
|
|
* apply to array of struct of two fields
|
|
|
|
* apply to array of struct of two fields
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
case DBUS_TYPE_DICT: {
|
|
|
|
case DBUS_TYPE_DICT: {
|
|
|
|
qDebug( "Got a hash!" );
|
|
|
|
tqDebug( "Got a hash!" );
|
|
|
|
TQMap<TQString, TQVariant> tempMap;
|
|
|
|
TQMap<TQString, TQVariant> tempMap;
|
|
|
|
DBusMessageIter dictIter;
|
|
|
|
DBusMessageIter dictIter;
|
|
|
|
dbus_message_iter_init_dict_iterator( d->iter, &dictIter );
|
|
|
|
dbus_message_iter_init_dict_iterator( d->iter, &dictIter );
|
|
|
@ -273,13 +273,13 @@ Message::iterator::fillVar()
|
|
|
|
} while( dbus_message_iter_has_next( &dictIter ) );
|
|
|
|
} while( dbus_message_iter_has_next( &dictIter ) );
|
|
|
|
d->var = TQVariant( tempMap );
|
|
|
|
d->var = TQVariant( tempMap );
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
qDebug( "Hash/Dict type not implemented" );
|
|
|
|
tqDebug( "Hash/Dict type not implemented" );
|
|
|
|
d->var = TQVariant();
|
|
|
|
d->var = TQVariant();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
qDebug( "not implemented" );
|
|
|
|
tqDebug( "not implemented" );
|
|
|
|
d->var = TQVariant();
|
|
|
|
d->var = TQVariant();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|