From 115620aabc09fde06c23e94046c3d9b47eaeff96 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 12 Jun 2014 16:18:40 +0200 Subject: [PATCH] QmlDesigner: cleanup unused methods - remove javascript methods: scrollView(delta), resetView() - remove javascript related signals - remove visibleCount debug output Change-Id: I63b0a204d7f570986e41fc9fb3762f13e5d63d79 Reviewed-by: Marco Bubke --- .../itemLibraryQmlSources/ItemsView.qml | 14 -------------- .../components/itemlibrary/itemlibrarymodel.cpp | 1 - .../components/itemlibrary/itemlibrarywidget.cpp | 4 ---- .../components/itemlibrary/itemlibrarywidget.h | 2 -- 4 files changed, 21 deletions(-) diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml index 6c0bc297a08..555d5c1dbb9 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml @@ -60,23 +60,9 @@ pixmap itemPixmap Rectangle { id: itemsView - // public - - function scrollView(delta) { - scrollbar.scroll(-delta / style.scrollbarWheelDeltaFactor) - } - - function resetView() { - scrollbar.reset() - } - signal itemSelected(int itemLibId) signal itemDragged(int itemLibId) - signal stopDragAndDrop - - // internal - signal expandAllEntries ItemsViewStyle { id: style } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 362a37e3156..19d25efb660 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -269,7 +269,6 @@ int ItemLibraryModel::visibleSectionCount() const if (sectionModel->isVisible()) ++visibleCount; ++sectionIterator; - qDebug() << __FUNCTION__ << visibleCount; } return visibleCount; diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 47b458abed9..0c265191fe2 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -225,7 +225,6 @@ void ItemLibraryWidget::setSearchFilter(const QString &searchFilter) { if (m_stackedWidget->currentIndex() == 0) { m_itemLibraryModel->setSearchText(searchFilter); - emit resetItemsView(); m_itemsView->update(); } else { QStringList nameFilterList; @@ -303,9 +302,6 @@ void ItemLibraryWidget::reloadQmlSource() QQuickItem *rootItem = qobject_cast(m_itemsView->rootObject()); connect(rootItem, SIGNAL(itemSelected(int)), this, SLOT(showItemInfo(int))); connect(rootItem, SIGNAL(itemDragged(int)), this, SLOT(startDragAndDropDelayed(int))); - connect(this, SIGNAL(scrollItemsView(QVariant)), rootItem, SLOT(scrollView(QVariant))); - connect(this, SIGNAL(resetItemsView()), rootItem, SLOT(resetView())); - } void ItemLibraryWidget::setImportFilter(FilterChangeFlag flag) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h index 5fe31d4bfa1..f875c787275 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h @@ -114,8 +114,6 @@ protected: signals: void itemActivated(const QString& itemName); - void scrollItemsView(QVariant delta); - void resetItemsView(); void qtBasicOnlyChecked(bool b); void meegoChecked(bool b);