Attachment #169998 for bug #237064

Lines 88-96 Link Here

(-)kdbus-0.8.6/src/dbusdispatcher.cpp (-2 / +2 lines)
88	params.append( text );	88	params.append( text );
89	else if ( type == "BOOLEAN" ) {	89	else if ( type == "BOOLEAN" ) {
90	if ( text.lower() == "true" )	90	if ( text.lower() == "true" )
91	params.append( QVariant(true, 0) );	91	params.append( true );
92	else if ( text.lower() == "false" )	92	else if ( text.lower() == "false" )
93	params.append( QVariant(false, 0) );	93	params.append( false );
94	else	94	else
95	ok = false;	95	ok = false;
96	}	96	}




QPtrList< DBusMethodArgument > DBusMethod::inArgs() const {

    QPtrList< DBusMethodArgument > inArgs = m_args;
    // be sure we have the first element in the list
    inArgs.first(); 
    while ( 0 != inArgs.current() ) {
        if ( inArgs.current()->direction() != "in" )
            inArgs.take();

QPtrList< DBusMethodArgument > DBusMethod::outArgs() const {

    QPtrList< DBusMethodArgument > outArgs = m_args;
    // be sure we have the first element in the list
    outArgs.first(); 
    while ( 0 != outArgs.current() ) {
        if ( outArgs.current()->direction() != "out" )
            outArgs.take();





    QString discoverPath( QDomElement const & elem );

    QDomDocument doc;
    QDBusProxy * proxy;
    DBusObject * p;
};


    // Now iterate through self, enumerating interfaces, properties, and
    // other objects.
    myElem = myElem.firstChild().toElement();

    try {
        do {
            if ( myElem.tagName() == "node" )
                new DBusObject( this, myElem, d->proxy );
            else if ( myElem.tagName() == "interface" )
                new DBusInterface( this, myElem );
            else
                kdWarning() << "Unhandled node in introspect data: "
                            << myElem.tagName() << endl;
            myElem = myElem.nextSibling().toElement();
        } while ( !myElem.isNull() );
    }
    catch ( std::runtime_error const & e ) {
        m_ok = false;

            .arg( proxy->lastError().message() )
        );

    QDomDocument doc;
    if ( !doc.setContent( reply[0].toString() ) )
        throw QDBusXmlError(
            i18n(

Return to bug 237064

Lines 55-62 Link Here

(-)kdbus-0.8.6/src/dbusmethod.cpp (-4 lines)
55	QPtrList< DBusMethodArgument > DBusMethod::inArgs() const {	55	QPtrList< DBusMethodArgument > DBusMethod::inArgs() const {
56		56
57	QPtrList< DBusMethodArgument > inArgs = m_args;	57	QPtrList< DBusMethodArgument > inArgs = m_args;
58	// be sure we have the first element in the list
59	inArgs.first();
60	while ( 0 != inArgs.current() ) {	58	while ( 0 != inArgs.current() ) {
61	if ( inArgs.current()->direction() != "in" )	59	if ( inArgs.current()->direction() != "in" )
62	inArgs.take();	60	inArgs.take();
Lines 69-76 Link Here
69	QPtrList< DBusMethodArgument > DBusMethod::outArgs() const {	67	QPtrList< DBusMethodArgument > DBusMethod::outArgs() const {
70		68
71	QPtrList< DBusMethodArgument > outArgs = m_args;	69	QPtrList< DBusMethodArgument > outArgs = m_args;
72	// be sure we have the first element in the list
73	outArgs.first();
74	while ( 0 != outArgs.current() ) {	70	while ( 0 != outArgs.current() ) {
75	if ( outArgs.current()->direction() != "out" )	71	if ( outArgs.current()->direction() != "out" )
76	outArgs.take();	72	outArgs.take();

Lines 42-48 Link Here

(-)kdbus-0.8.6/src/dbusobject.cpp (-9 / +9 lines)
42		42
43	QString discoverPath( QDomElement const & elem );	43	QString discoverPath( QDomElement const & elem );
44		44
45	QDomDocument doc;
46	QDBusProxy * proxy;	45	QDBusProxy * proxy;
47	DBusObject * p;	46	DBusObject * p;
48	};	47	};
Lines 89-107 Link Here
89		88
90	// Now iterate through self, enumerating interfaces, properties, and	89	// Now iterate through self, enumerating interfaces, properties, and
91	// other objects.	90	// other objects.
92	QDomElement childElement = myElem.firstChild().toElement();	91	myElem = myElem.firstChild().toElement();
93		92
94	try {	93	try {
95	do {	94	do {
96	if ( childElement.tagName() == "node" )	95	if ( myElem.tagName() == "node" )
97	new DBusObject( this, childElement, d->proxy );	96	new DBusObject( this, myElem, d->proxy );
98	else if ( childElement.tagName() == "interface" )	97	else if ( myElem.tagName() == "interface" )
99	new DBusInterface( this, childElement );	98	new DBusInterface( this, myElem );
100	else	99	else
101	kdWarning() << "Unhandled node in introspect data: "	100	kdWarning() << "Unhandled node in introspect data: "
102	<< childElement.tagName() << endl;	101	<< myElem.tagName() << endl;
103	childElement = childElement.nextSibling().toElement();	102	myElem = myElem.nextSibling().toElement();
104	} while ( !childElement.isNull() );	103	} while ( !myElem.isNull() );
105	}	104	}
106	catch ( std::runtime_error const & e ) {	105	catch ( std::runtime_error const & e ) {
107	m_ok = false;	106	m_ok = false;
Lines 129-134 Link Here
129	.arg( proxy->lastError().message() )	128	.arg( proxy->lastError().message() )
130	);	129	);
131		130
		131	QDomDocument doc;
132	if ( !doc.setContent( reply[0].toString() ) )	132	if ( !doc.setContent( reply[0].toString() ) )
133	throw QDBusXmlError(	133	throw QDBusXmlError(
134	i18n(	134	i18n(