feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: remove unused code (meego, ...)

Browse Source 
Change-Id: I25c1bc568b2d83cc8f166a041dc56c022d5f638a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-06-07 20:15:31 +02:00
parent ef2e3914ca
commit 792b9fe6c9
2 changed files with 0 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -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());