From 309d38c8f0434c551fe6a4161dab5614ce0419ea Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Fri, 23 Jan 2015 11:06:54 +0200
Subject: [PATCH] Sort the possible import list.

Change-Id: Iaa77273ebaf0867119f06c6ee3c2d29a61168933
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../importmanager/importswidget.cpp           | 55 ++++++++++---------
 .../components/importmanager/importswidget.h  |  2 +-
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
index 4102b965239..df5d94b78a5 100644
--- a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
+++ b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
@@ -64,33 +64,6 @@ static bool isImportAlreadyUsed(const Import &import, QList<ImportLabel*> import
     return false;
 }
 
-void ImportsWidget::setPossibleImports(const QList<Import> &possibleImports)
-{
-    m_addImportComboBox->clear();
-    foreach (const Import &possibleImport, possibleImports) {
-        if (!isImportAlreadyUsed(possibleImport, m_importLabels))
-            m_addImportComboBox->addItem(possibleImport.toString(true), QVariant::fromValue(possibleImport));
-    }
-}
-
-void ImportsWidget::removePossibleImports()
-{
-    m_addImportComboBox->clear();
-}
-
-void ImportsWidget::setUsedImports(const QList<Import> &usedImports)
-{
-    foreach (ImportLabel *importLabel, m_importLabels)
-        importLabel->setReadOnly(usedImports.contains(importLabel->import()));
-
-}
-
-void ImportsWidget::removeUsedImports()
-{
-    foreach (ImportLabel *importLabel, m_importLabels)
-        importLabel->setEnabled(true);
-}
-
 static bool importLess(const Import &firstImport, const Import &secondImport)
 {
     if (firstImport.url() == secondImport.url())
@@ -117,6 +90,34 @@ static bool importLess(const Import &firstImport, const Import &secondImport)
     return false;
 }
 
+void ImportsWidget::setPossibleImports(QList<Import> possibleImports)
+{
+    Utils::sort(possibleImports, importLess);
+    m_addImportComboBox->clear();
+    foreach (const Import &possibleImport, possibleImports) {
+        if (!isImportAlreadyUsed(possibleImport, m_importLabels))
+            m_addImportComboBox->addItem(possibleImport.toString(true), QVariant::fromValue(possibleImport));
+    }
+}
+
+void ImportsWidget::removePossibleImports()
+{
+    m_addImportComboBox->clear();
+}
+
+void ImportsWidget::setUsedImports(const QList<Import> &usedImports)
+{
+    foreach (ImportLabel *importLabel, m_importLabels)
+        importLabel->setReadOnly(usedImports.contains(importLabel->import()));
+
+}
+
+void ImportsWidget::removeUsedImports()
+{
+    foreach (ImportLabel *importLabel, m_importLabels)
+        importLabel->setEnabled(true);
+}
+
 void ImportsWidget::setImports(const QList<Import> &imports)
 {
     qDeleteAll(m_importLabels);
diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.h b/src/plugins/qmldesigner/components/importmanager/importswidget.h
index 5716f239158..c0a1920bc54 100644
--- a/src/plugins/qmldesigner/components/importmanager/importswidget.h
+++ b/src/plugins/qmldesigner/components/importmanager/importswidget.h
@@ -52,7 +52,7 @@ public:
     void setImports(const QList<Import> &imports);
     void removeImports();
 
-    void setPossibleImports(const QList<Import> &possibleImports);
+    void setPossibleImports(QList<Import> possibleImports);
     void removePossibleImports();
 
     void setUsedImports(const QList<Import> &possibleImports);