From 792b9fe6c9479f8b089ffe351f3667c9a693bd26 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 7 Jun 2016 20:15:31 +0200 Subject: [PATCH] QmlDesigner: remove unused code (meego, ...) Change-Id: I25c1bc568b2d83cc8f166a041dc56c022d5f638a Reviewed-by: Thomas Hartmann --- .../itemlibrary/itemlibrarywidget.cpp | 79 ------------------- .../itemlibrary/itemlibrarywidget.h | 8 -- 2 files changed, 87 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 8a32392f099..fabc336d820 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -168,18 +168,12 @@ void ItemLibraryWidget::setItemLibraryInfo(ItemLibraryInfo *itemLibraryInfo) void ItemLibraryWidget::updateImports() { - FilterChangeFlag filter; - filter = QtBasic; if (m_model) { QStringList imports; foreach (const Import &import, m_model->imports()) if (import.isLibraryImport()) imports << import.url(); - if (imports.contains(QLatin1String("com.nokia.meego"), Qt::CaseInsensitive)) - filter = Meego; } - - setImportFilter(filter); } void ItemLibraryWidget::setImportsWidget(QWidget *importsWidget) @@ -225,30 +219,6 @@ void ItemLibraryWidget::setModel(Model *model) updateModel(); } -void ItemLibraryWidget::emitImportChecked() -{ - if (!m_model) - return; - - bool qtOnlyImport = false; - bool meegoImport = false; - - foreach (const Import &import, m_model->imports()) { - if (import.isLibraryImport()) { - if (import.url().contains(QLatin1String("meego"), Qt::CaseInsensitive)) - meegoImport = true; - if (import.url().contains(QLatin1String("Qt"), Qt::CaseInsensitive) || import.url().contains(QLatin1String("QtQuick"), Qt::CaseInsensitive)) - qtOnlyImport = true; - } - } - - if (meegoImport) - qtOnlyImport = false; - - emit qtBasicOnlyChecked(qtOnlyImport); - emit meegoChecked(meegoImport); -} - void ItemLibraryWidget::setCurrentIndexOfStackedWidget(int index) { if (index == 2) @@ -272,55 +242,6 @@ void ItemLibraryWidget::reloadQmlSource() m_itemViewQuickWidget->setSource(QUrl::fromLocalFile(itemLibraryQmlFilePath)); } -void ItemLibraryWidget::setImportFilter(FilterChangeFlag flag) -{ - return; - - static bool block = false; - if (!m_model) - return; - if (flag == m_filterFlag) - return; - - if (block == true) - return; - - - FilterChangeFlag oldfilterFlag = m_filterFlag; - - QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); - try { - block = true; - if (flag == QtBasic) - removeImport(QStringLiteral("com.nokia.meego")); - else if (flag == Meego) - addImport(QStringLiteral("com.nokia.meego"), QStringLiteral("1.0")); - QApplication::restoreOverrideCursor(); - block = false; - m_filterFlag = flag; - } catch (const RewritingException &) { - QApplication::restoreOverrideCursor(); - m_filterFlag = oldfilterFlag; - block = false; - // do something about it - } - - emitImportChecked(); -} - -void ItemLibraryWidget::onQtBasicOnlyChecked(bool b) -{ - if (b) - setImportFilter(QtBasic); - -} - -void ItemLibraryWidget::onMeegoChecked(bool b) -{ - if (b) - setImportFilter(Meego); -} - void ItemLibraryWidget::updateModel() { m_itemLibraryModel->update(m_itemLibraryInfo.data(), m_model.data()); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h index 3665d34a954..3d4bc503e25 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h @@ -95,20 +95,12 @@ public slots: void setModel(Model *model); - void setImportFilter(FilterChangeFlag flag); - - void onQtBasicOnlyChecked(bool b); - void onMeegoChecked(bool b); - protected: void removeImport(const QString &name); void addImport(const QString &name, const QString &version); - void emitImportChecked(); signals: void itemActivated(const QString& itemName); - void qtBasicOnlyChecked(bool b); - void meegoChecked(bool b); private slots: void setCurrentIndexOfStackedWidget(int index);