Attachment #2856 for bug #2925

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2925
Collapse All | Expand All

Line 1 Link Here

(-)a/cmake (-1 / +1 lines)
1	Subproject commit edad8a20b944d45f366acc15b2cd4d291ce3a5dd	1	Subproject commit 0e0f4e9be4ce481304f4a9e7b0069af157425d74




    map.insert(key, qFetchParameter(&itemIter));
}

void qFetchObjectPathKeyMapEntry(TQT_DBusDataMap<TQT_DBusObjectPath>& map, DBusMessageIter* it)
{
    DBusMessageIter itemIter;
    dbus_message_iter_recurse(it, &itemIter);
    Q_ASSERT(dbus_message_iter_has_next(&itemIter));

    TQT_DBusObjectPath key = qFetchParameter(&itemIter).toObjectPath();

    dbus_message_iter_next(&itemIter);

    map.insert(key, qFetchParameter(&itemIter));
}

void qFetchStringKeyMapEntry(TQT_DBusDataMap<TQString>& map, DBusMessageIter* it)
{
    DBusMessageIter itemIter;

    Q_ASSERT(dbus_message_iter_has_next(&itemIter));

    TQString key = qFetchParameter(&itemIter).toString();
	tqDebug("qFetchStringKeyMapEntry key : %s", key.latin1());

    dbus_message_iter_next(&itemIter);


            return TQT_DBusData::fromUInt64KeyMap(map);
        }

        case DBUS_TYPE_OBJECT_PATH:  {
            TQT_DBusDataMap<TQT_DBusObjectPath> map = prototype.toObjectPathKeyMap();
            do {
            	qFetchObjectPathKeyMapEntry(map, it);
            } while (dbus_message_iter_next(it));

            return TQT_DBusData::fromObjectPathKeyMap(map);
        }
        case DBUS_TYPE_STRING:      // fall through
        case DBUS_TYPE_OBJECT_PATH: // fall through
        case DBUS_TYPE_SIGNATURE: {
            TQT_DBusDataMap<TQString> map = prototype.toStringKeyMap();
            do {

            dbus_message_iter_recurse(it, &sub);

            return qFetchMap(&sub, prototypeList[0]);

//        } else if (arrayType == DBUS_TYPE_BYTE) {
//            DBusMessageIter sub;
//            dbus_message_iter_recurse(it, &sub);
//            int len = dbus_message_iter_get_array_len(&sub);
//            char* data;
//            dbus_message_iter_get_fixed_array(&sub,&data,&len);
//            return TQCString(data,len);
//         } else {

        } else {
            TQT_DBusDataList list = prototypeList[0].toList();


Return to bug 2925

Lines 400-405 void qFetchUInt64KeyMapEntry(TQT_DBusDataMap<TQ_UINT64>& map, DBusMessageIter* i Link Here

(-)a/tqdbusmarshall.cpp (-11 / +22 lines)
400	map.insert(key, qFetchParameter(&itemIter));	400	map.insert(key, qFetchParameter(&itemIter));
401	}	401	}
402		402
		403	void qFetchObjectPathKeyMapEntry(TQT_DBusDataMap<TQT_DBusObjectPath>& map, DBusMessageIter* it)
		404	{
		405	DBusMessageIter itemIter;
		406	dbus_message_iter_recurse(it, &itemIter);
		407	Q_ASSERT(dbus_message_iter_has_next(&itemIter));
		408
		409	TQT_DBusObjectPath key = qFetchParameter(&itemIter).toObjectPath();
		410
		411	dbus_message_iter_next(&itemIter);
		412
		413	map.insert(key, qFetchParameter(&itemIter));
		414	}
		415
403	void qFetchStringKeyMapEntry(TQT_DBusDataMap<TQString>& map, DBusMessageIter* it)	416	void qFetchStringKeyMapEntry(TQT_DBusDataMap<TQString>& map, DBusMessageIter* it)
404	{	417	{
405	DBusMessageIter itemIter;	418	DBusMessageIter itemIter;
Lines 407-412 void qFetchStringKeyMapEntry(TQT_DBusDataMap<TQString>& map, DBusMessageIter* it Link Here
407	Q_ASSERT(dbus_message_iter_has_next(&itemIter));	420	Q_ASSERT(dbus_message_iter_has_next(&itemIter));
408		421
409	TQString key = qFetchParameter(&itemIter).toString();	422	TQString key = qFetchParameter(&itemIter).toString();
		423	tqDebug("qFetchStringKeyMapEntry key : %s", key.latin1());
410		424
411	dbus_message_iter_next(&itemIter);	425	dbus_message_iter_next(&itemIter);
412		426
Lines 487-494 static TQT_DBusData qFetchMap(DBusMessageIter *it, const TQT_DBusData& prototype Link Here
487	return TQT_DBusData::fromUInt64KeyMap(map);	501	return TQT_DBusData::fromUInt64KeyMap(map);
488	}	502	}
489		503
		504	case DBUS_TYPE_OBJECT_PATH: {
		505	TQT_DBusDataMap<TQT_DBusObjectPath> map = prototype.toObjectPathKeyMap();
		506	do {
		507	qFetchObjectPathKeyMapEntry(map, it);
		508	} while (dbus_message_iter_next(it));
		509
		510	return TQT_DBusData::fromObjectPathKeyMap(map);
		511	}
490	case DBUS_TYPE_STRING: // fall through	512	case DBUS_TYPE_STRING: // fall through
491	case DBUS_TYPE_OBJECT_PATH: // fall through
492	case DBUS_TYPE_SIGNATURE: {	513	case DBUS_TYPE_SIGNATURE: {
493	TQT_DBusDataMap<TQString> map = prototype.toStringKeyMap();	514	TQT_DBusDataMap<TQString> map = prototype.toStringKeyMap();
494	do {	515	do {
Lines 545-560 static TQT_DBusData qFetchParameter(DBusMessageIter *it) Link Here
545	dbus_message_iter_recurse(it, &sub);	566	dbus_message_iter_recurse(it, &sub);
546		567
547	return qFetchMap(&sub, prototypeList[0]);	568	return qFetchMap(&sub, prototypeList[0]);
548
549	// } else if (arrayType == DBUS_TYPE_BYTE) {
550	// DBusMessageIter sub;
551	// dbus_message_iter_recurse(it, &sub);
552	// int len = dbus_message_iter_get_array_len(&sub);
553	// char* data;
554	// dbus_message_iter_get_fixed_array(&sub,&data,&len);
555	// return TQCString(data,len);
556	// } else {
557
558	} else {	569	} else {
559	TQT_DBusDataList list = prototypeList[0].toList();	570	TQT_DBusDataList list = prototypeList[0].toList();
560		571