Skip to content
Snippets Groups Projects
Verified Commit a449974e authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Adopt changed types

parent fd2bd2eb
Branches
Tags
No related merge requests found
...@@ -25,7 +25,7 @@ import de.justjanne.libquassel.protocol.features.LegacyFeature ...@@ -25,7 +25,7 @@ import de.justjanne.libquassel.protocol.features.LegacyFeature
import de.justjanne.libquassel.protocol.features.QuasselFeatureName import de.justjanne.libquassel.protocol.features.QuasselFeatureName
import de.justjanne.libquassel.protocol.serializers.HandshakeSerializer import de.justjanne.libquassel.protocol.serializers.HandshakeSerializer
import de.justjanne.libquassel.protocol.types.HandshakeMessage import de.justjanne.libquassel.protocol.types.HandshakeMessage
import de.justjanne.libquassel.protocol.variant.QStringList import de.justjanne.libquassel.protocol.types.QStringList
import de.justjanne.libquassel.protocol.variant.QVariantMap import de.justjanne.libquassel.protocol.variant.QVariantMap
import de.justjanne.libquassel.protocol.variant.QtType import de.justjanne.libquassel.protocol.variant.QtType
import de.justjanne.libquassel.protocol.variant.into import de.justjanne.libquassel.protocol.variant.into
......
...@@ -22,7 +22,7 @@ package de.justjanne.libquassel.protocol.serializers.qt ...@@ -22,7 +22,7 @@ package de.justjanne.libquassel.protocol.serializers.qt
import de.justjanne.libquassel.protocol.features.FeatureSet import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.io.ChainedByteBuffer import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
import de.justjanne.libquassel.protocol.serializers.QtSerializer import de.justjanne.libquassel.protocol.serializers.QtSerializer
import de.justjanne.libquassel.protocol.variant.QStringList import de.justjanne.libquassel.protocol.types.QStringList
import de.justjanne.libquassel.protocol.variant.QtType import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer import java.nio.ByteBuffer
......
...@@ -70,7 +70,7 @@ object QVariantSerializer : QtSerializer<QVariant_> { ...@@ -70,7 +70,7 @@ object QVariantSerializer : QtSerializer<QVariant_> {
val serializer = QtSerializers[type] val serializer = QtSerializers[type]
?: throw NoSerializerForTypeException.Qt(type) ?: throw NoSerializerForTypeException.Qt(type)
val value = serializer.deserialize(buffer, featureSet) val value = serializer.deserialize(buffer, featureSet)
return QVariant.of(value, serializer as QtSerializer<Any?>) return QVariant.Typed(value, serializer as QtSerializer<Any?>)
} }
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
...@@ -78,6 +78,6 @@ object QVariantSerializer : QtSerializer<QVariant_> { ...@@ -78,6 +78,6 @@ object QVariantSerializer : QtSerializer<QVariant_> {
val serializer = QuasselSerializers[type] val serializer = QuasselSerializers[type]
?: throw NoSerializerForTypeException.Quassel(type) ?: throw NoSerializerForTypeException.Quassel(type)
val value = serializer.deserialize(buffer, featureSet) val value = serializer.deserialize(buffer, featureSet)
return QVariant.of(value, serializer as QuasselSerializer<Any?>) return QVariant.Custom(value, serializer as QuasselSerializer<Any?>)
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment