aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2021-02-07 16:32:37 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2021-02-10 16:30:40 +0000
commitf00e023b92391e00d827aeaddfa9b88f5ad37c59 (patch)
tree93a14cf815eb241c595d88bba1c3cb916bf037c2 /src
parent07b92e9ee58d0c971c9e0fb3e7c83f1f8f1d1079 (diff)
buildgraph: fix storing container sizes
The type should match the one used in load() since in qt6 the type is not int anymore Change-Id: I0e7e402dec6f059279de933d5afd0c450cde8ddd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/lib/corelib/buildgraph/rulecommands.cpp2
-rw-r--r--src/lib/corelib/tools/persistence.cpp2
-rw-r--r--src/lib/corelib/tools/persistence.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp
index 8fa3255f1..a119e067a 100644
--- a/src/lib/corelib/buildgraph/rulecommands.cpp
+++ b/src/lib/corelib/buildgraph/rulecommands.cpp
@@ -468,7 +468,7 @@ void CommandList::load(PersistentPool &pool)
void CommandList::store(PersistentPool &pool) const
{
- pool.store(m_commands.size());
+ pool.store(int(m_commands.size()));
for (const AbstractCommandPtr &cmd : m_commands) {
pool.store(static_cast<quint8>(cmd->type()));
pool.store(cmd);
diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp
index 4674b24ae..ae57fdda4 100644
--- a/src/lib/corelib/tools/persistence.cpp
+++ b/src/lib/corelib/tools/persistence.cpp
@@ -218,7 +218,7 @@ void PersistentPool::doStoreValue(const QString &s)
void PersistentPool::doStoreValue(const QStringList &l)
{
- m_stream << l.size();
+ m_stream << int(l.size());
for (const QString &s : l)
store(s);
}
diff --git a/src/lib/corelib/tools/persistence.h b/src/lib/corelib/tools/persistence.h
index 7e3f3a11f..29d586177 100644
--- a/src/lib/corelib/tools/persistence.h
+++ b/src/lib/corelib/tools/persistence.h
@@ -498,7 +498,7 @@ struct PPHelper<T, std::enable_if_t<IsKeyValueContainer<T>::value>>
{
static void store(const T &container, PersistentPool *pool)
{
- pool->store(container.size());
+ pool->store(int(container.size()));
for (auto it = container.cbegin(); it != container.cend(); ++it) {
pool->store(it.key());
pool->store(it.value());