summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2014-06-12 16:18:40 +0200
committerMarco Bubke <marco.bubke@digia.com>2014-06-18 16:53:51 +0200
commit115620aabc09fde06c23e94046c3d9b47eaeff96 (patch)
tree7e818eead45f27017ca02fbb14d2fc2349d90538
parenta850dc20335c90b5dd2ab7752128a925cdd5fa22 (diff)
downloadqt-creator-115620aabc09fde06c23e94046c3d9b47eaeff96.tar.gz
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 <marco.bubke@digia.com>
-rw-r--r--share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml14
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp1
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp4
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h2
4 files changed, 0 insertions, 21 deletions
diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
index 6c0bc297a0..555d5c1dbb 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 362a37e315..19d25efb66 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 47b458abed..0c265191fe 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<QQuickItem*>(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 5fe31d4bfa..f875c78727 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);