Changeset 769 for trunk/tools/designer/src/lib/shared/actionrepository.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/lib/shared/actionrepository.cpp (modified) (7 diffs)

trunk/tools/designer/src/lib/shared/actionrepository.cpp

@@ -78 +78 @@
 }
 
-static QIcon fixActionIcon(const QIcon &icon)
-{
-    if (icon.isNull())
-        return qdesigner_internal::emptyIcon();
-    return icon;
-}
-
 namespace qdesigner_internal {
 
@@ -90 +83 @@
 ActionModel::ActionModel(QWidget *parent ) :
     QStandardItemModel(parent),
+
     m_core(0)
 {
@@ -128 +122 @@
        list += item(row, i);
 
-    setItems(m_core, actionOfItem(list.front()), list);
+    setItems(m_core, actionOfItem(list.front()), list);
 }
 
@@ -151 +145 @@
         items.push_back(item);
     }
-    setItems(m_core, action, items);
+    setItems(m_core, action, items);
     appendRow(items);
     return indexFromItem(items.front());
@@ -186 +180 @@
 }
 
-void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action, QStandardItemList &sl)
+void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action,
+                            const QIcon &defaultIcon,
+                            QStandardItemList &sl)
 {
 
@@ -201 +197 @@
     QStandardItem *item =  sl[NameColumn];
     item->setText(action->objectName());
-    item->setIcon(fixActionIcon(action->icon()));
+    QIcon icon = action->icon();
+    if (icon.isNull())
+        icon = defaultIcon;
+    item->setIcon(icon);
     item->setToolTip(firstTooltip);
     item->setWhatsThis(firstTooltip);
@@ -245 +244 @@
 
     QSet<QAction*> actions;
-    foreach (const  QModelIndex &index, indexes)
+    foreach (const QModelIndex &index, indexes)
         if (QStandardItem *item = itemFromIndex(index))
             if (QAction *action = actionOfItem(item))