Merge branch 'test2' into 'master'

[qtcontacts] Correct header file method signatures. Fixes MER#1498 See merge request !2
sailfishos · Mar 21, 2016 · 1d98870 · 1d98870
2 parents 5856516 + f8790ed
commit 1d98870
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 53 deletions.
diff --git a/src/engine/contactstransientstore.cpp b/src/engine/contactstransientstore.cpp
@@ -579,7 +579,7 @@ void SharedMemoryManager::release(int index) const
     }
 }
 
-ContactsTransientStore::const_iterator::const_iterator(const MemoryTable *table, size_t position)
+ContactsTransientStore::const_iterator::const_iterator(const MemoryTable *table, quint32 position)
     : MemoryTable::const_iterator(table, position)
 {
 }

diff --git a/src/engine/memorytable.cpp b/src/engine/memorytable.cpp
@@ -338,7 +338,7 @@ quint32 MemoryTablePrivate::allocate(quint32 size, TableMetadata *table, bool in
 
     // Align the allocation so that the header is directly accessible
     quint32 allocationSize = static_cast<quint32>(requiredSpace(size));
-    allocationSize = roundUp(allocationSize, sizeof(quint32));
+    allocationSize = roundUp(allocationSize, static_cast<quint32>(sizeof(quint32)));
 
     if (table->freeList) {
         // Try to reuse a freed block
@@ -528,7 +528,7 @@ MemoryTable::Error MemoryTable::migrateTo(MemoryTable &other) const
     return MemoryTablePrivate::migrateTo(MemoryTablePrivate::metadata(&other), MemoryTablePrivate::metadata(this));
 }
 
-MemoryTable::const_iterator::const_iterator(const MemoryTable *table, size_t position)
+MemoryTable::const_iterator::const_iterator(const MemoryTable *table, quint32 position)
     : table(table)
     , position(position)
 {