From a5b034d4a9c44f9bc1e83b01de82530f8fc63013 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Sat, 4 Apr 2015 14:41:04 -0400
Subject: Imported Upstream version 3.0.4

---
 SQLiteStudio3/guiSQLiteStudio/dbobjlistmodel.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'SQLiteStudio3/guiSQLiteStudio/dbobjlistmodel.cpp')

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();
 }
 
-- 
cgit v1.2.3