Changeset 846 for trunk/tools/qdbus/qdbusviewer/qdbusmodel.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdbus/qdbusviewer/qdbusmodel.cpp (modified) (4 diffs)

trunk/tools/qdbus/qdbusviewer/qdbusmodel.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -76 +76 @@
     QString name;
     QString caption;
+    QString typeSignature;
 };
 
@@ -119 +120 @@
                     child.attribute(QLatin1String("name")), parent);
             item->caption = QLatin1String("Method: ") + item->name;
+            //get "type" from <arg> where "direction" is "in"
+            QDomElement n = child.firstChildElement();
+            while (!n.isNull()) {
+                if (n.attribute(QLatin1String("direction")) == QLatin1String("in"))
+                    item->typeSignature += n.attribute(QLatin1String("type"));
+                n = n.nextSiblingElement();
+            }
         } else if (child.tagName() == QLatin1String("signal")) {
             item = new QDBusItem(QDBusModel::SignalItem,
@@ -299 +307 @@
 }
 
+QString QDBusModel::dBusTypeSignature(const QModelIndex &index) const
+{
+    QDBusItem *item = static_cast<QDBusItem *>(index.internalPointer());
+    return item ? item->typeSignature : QString();
+}
+
 QModelIndex QDBusModel::findObject(const QDBusObjectPath &objectPath)
 {