summaryrefslogtreecommitdiffstats
path: root/src/application-lib/intentinfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/application-lib/intentinfo.cpp')
-rw-r--r--src/application-lib/intentinfo.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/application-lib/intentinfo.cpp b/src/application-lib/intentinfo.cpp
index 1097f526..3395d7f5 100644
--- a/src/application-lib/intentinfo.cpp
+++ b/src/application-lib/intentinfo.cpp
@@ -47,8 +47,6 @@
QT_BEGIN_NAMESPACE_AM
-static constexpr quint32 IntentInfoDataStreamVersion = 1;
-
IntentInfo::IntentInfo(PackageInfo *packageInfo)
: m_packageInfo(packageInfo)
@@ -112,10 +110,15 @@ QString IntentInfo::icon() const
return m_icon.isEmpty() ? m_packageInfo->icon() : m_icon;
}
+
+const quint32 IntentInfo::DataStreamVersion = 2;
+
+
void IntentInfo::writeToDataStream(QDataStream &ds) const
{
- ds << IntentInfoDataStreamVersion
- << m_id
+ //NOTE: increment DataStreamVersion above, if you make any changes here
+
+ ds << m_id
<< (m_visibility == Public ? qSL("public") : qSL("private"))
<< m_requiredCapabilities
<< m_parameterMatch
@@ -128,12 +131,12 @@ void IntentInfo::writeToDataStream(QDataStream &ds) const
IntentInfo *IntentInfo::readFromDataStream(PackageInfo *pkg, QDataStream &ds)
{
+ //NOTE: increment DataStreamVersion above, if you make any changes here
+
QScopedPointer<IntentInfo> intent(new IntentInfo(pkg));
QString visibilityStr;
- auto dataStreamVersion = IntentInfoDataStreamVersion;
- ds >> dataStreamVersion
- >> intent->m_id
+ ds >> intent->m_id
>> visibilityStr
>> intent->m_requiredCapabilities
>> intent->m_parameterMatch
@@ -143,9 +146,6 @@ IntentInfo *IntentInfo::readFromDataStream(PackageInfo *pkg, QDataStream &ds)
>> intent->m_descriptions
>> intent->m_icon;
- if (dataStreamVersion != IntentInfoDataStreamVersion)
- return nullptr;
-
intent->m_visibility = (visibilityStr == qSL("public")) ? Public : Private;
intent->m_categories.sort();