diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
| commit | e571839e140139a6a819077e94cf8cc01c13b29f (patch) | |
| tree | 8263635257cfb5ed979a584a958103b700bf31e7 /SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h | |
| parent | 407eac41f46936e3f346bb5a964a682e578b4237 (diff) | |
| parent | 89214766d8e3e7b8dd749a1fa18a5b9727f5010d (diff) | |
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST 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>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h index d8e54b4..89c3d96 100644 --- a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h +++ b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h @@ -700,6 +700,8 @@ void AbstractDb3<T>::releaseAggregateContext(typename T::context* context) template <class T> void AbstractDb3<T>::registerDefaultCollation(void* fnUserData, typename T::handle* fnDbHandle, int eTextRep, const char* collationName) { + UNUSED(eTextRep); + CollationUserData* defUserData = reinterpret_cast<CollationUserData*>(fnUserData); if (!defUserData) { @@ -725,7 +727,7 @@ void AbstractDb3<T>::registerDefaultCollation(void* fnUserData, typename T::hand return; } - int res = T::create_collation_v2(fnDbHandle, collationName, eTextRep, nullptr, + int res = T::create_collation_v2(fnDbHandle, collationName, T::UTF8, nullptr, &AbstractDb3<T>::evaluateDefaultCollation, nullptr); if (res != T::OK) @@ -738,7 +740,7 @@ int AbstractDb3<T>::evaluateDefaultCollation(void* userData, int length1, const UNUSED(userData); UNUSED(length1); UNUSED(length2); - return COLLATIONS->evaluateDefault(QString::fromUtf8((const char*)value1), QString::fromUtf8((const char*)value2)); + return COLLATIONS->evaluateDefault(QString::fromUtf8((const char*)value1, length1), QString::fromUtf8((const char*)value2, length2)); } template <class T> |