Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 14 insertions, 7 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dbobjlistmodel.cpp b/SQLiteStudio3/guiSQLiteStudio/dbobjlistmodel.cpp
index 99d3f27..00914a1 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbobjlistmodel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dbobjlistmodel.cpp
@@ -14,12 +14,7 @@ QVariant DbObjListModel::data(const QModelIndex& index, int role) const
         return QVariant();
 
     if (role == Qt::DisplayRole || role == Qt::EditRole)
-    {
-        if (sortMode == SortMode::Alphabetical)
-            return objectList[index.row()];
-        else
-            return unsortedObjectList[index.row()];
-    }
+        return objectList[index.row()];
 
     return QVariant();
 }
@@ -84,7 +79,19 @@ void DbObjListModel::updateList()
     resolver.setIgnoreSystemObjects(!includeSystemObjects);
     objectList = resolver.getObjects(typeString().toLower());
     unsortedObjectList = objectList;
-    qSort(objectList);
+
+    switch (sortMode)
+    {
+        case SortMode::Alphabetical:
+            objectList.sort();
+            break;
+        case SortMode::AlphabeticalCaseInsensitive:
+            objectList.sort(Qt::CaseInsensitive);
+            break;
+        case SortMode::LikeInDb:
+            break;
+    }
+
     endResetModel();
 }