Changeset 846 for trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (15 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/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp (modified) (6 diffs)

trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -64 +64 @@
 #include <QtGui/QButtonGroup>
 #include <QtGui/QMenu>
+
 #include <QtGui/QStandardItemModel>
 #include <QtGui/QComboBox>
@@ -713 +714 @@
     m_core(core),
     m_model(new ConnectionModel(this)),
+
     m_handling_selection_change(false)
 {
-    m_view->setModel(m_model);
+    m_proxy_model->setSourceModel(m_model);
+    m_view->setModel(m_proxy_model);
+    m_view->setSortingEnabled(true);
     m_view->setItemDelegate(new ConnectionDelegate(this));
     m_view->setEditTriggers(QAbstractItemView::DoubleClicked
@@ -721 +725 @@
     m_view->setRootIsDecorated(false);
     m_view->setTextElideMode (Qt::ElideMiddle);
-    connect(m_view, SIGNAL(activated(QModelIndex)), this, SLOT(updateUi()));
+    connect(m_viewQModelIndex)), this, SLOT(updateUi()));
     connect(m_view->header(), SIGNAL(sectionDoubleClicked(int)), m_view, SLOT(resizeColumnToContents(int)));
 
@@ -791 +795 @@
         return;
 
-    QModelIndex index = m_model->connectionToIndex(con);
+    QModelIndex index = m_);
     if (index == m_view->currentIndex())
         return;
@@ -809 +813 @@
         return;
 
-    Connection *con = m_model->indexToConnection(index);
+    Connection *con = m_model->indexToConnection();
     if (m_editor->selected(con))
         return;