From 40f157978f3ecd9707740ec614fbdee595bce4b9 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 21 Mar 2020 13:48:39 +0800
Subject: [PATCH] No more data class for ProtoBuf and JceStruct
---
.../mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt | 2 +-
.../qqandroid/network/protocol/data/jce/PushNotifyPack.kt | 2 +-
.../mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt | 2 +-
.../mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt | 2 +-
.../mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt | 4 ++--
.../mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt
index 9a0545802..e99758ad1 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt
@@ -103,7 +103,7 @@ internal class NetSegConf(
@Suppress("ArrayInDataClass")
@Serializable
-internal data class PushReq(
+internal class PushReq(
@JceId(1) val type: Int,
@JceId(2) val jcebuf: ByteArray,
@JceId(3) val seq: Long
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt
index f9550fec3..72eeff0e5 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt
@@ -17,7 +17,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
@Suppress("ArrayInDataClass")
@Serializable
-internal data class RequestPushNotify(
+internal class RequestPushNotify(
@JceId(0) val uin: Long? = 0L,
@JceId(1) val ctype: Byte = 0,
@JceId(2) val strService: String?,
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt
index 8eca4ba11..c877035a3 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt
@@ -78,7 +78,7 @@ internal class Cmd0x352 : ProtoBuf {
@Suppress("ArrayInDataClass")
@Serializable
- data class ImgInfo(
+ class ImgInfo(
@ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoId(2) val fileType: Int = 0,
@ProtoId(3) val fileSize: Long = 0L,
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt
index bd818b0e5..a2f62a9c9 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt
@@ -147,7 +147,7 @@ internal class Cmd0x388 : ProtoBuf {
@Suppress("ArrayInDataClass")
@Serializable
- data class ImgInfo(
+ class ImgInfo(
@ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoId(2) val fileType: Int = 0,
@ProtoId(3) val fileSize: Long = 0L,
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt
index a4c0abfdb..2d606cb12 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Msg.kt
@@ -664,7 +664,7 @@ internal class ImMsgBody : ProtoBuf {
) : ProtoBuf
@Serializable // 非官方.
- internal data class PbReserve(
+ internal class PbReserve(
@ProtoId(1) val unknown1: Int = 1,
@ProtoId(2) val unknown2: Int = 0,
@ProtoId(6) val unknown3: Int = 0,
@@ -1142,7 +1142,7 @@ internal class ImReceipt : ProtoBuf {
) : ProtoBuf
@Serializable
- internal data class ReceiptResp(
+ internal class ReceiptResp(
@ProtoId(1) val command: Int /* enum */ = 1,
@ProtoId(2) val receiptInfo: ReceiptInfo? = null
) : ProtoBuf
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt
index f0d48e18c..613d46983 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgSvc.kt
@@ -112,7 +112,7 @@ internal class MsgSvc : ProtoBuf {
) : ProtoBuf
@Serializable
- internal data class MsgSendInfo(
+ internal class MsgSendInfo(
@ProtoId(1) val receiver: Int = 0
) : ProtoBuf
@@ -456,7 +456,7 @@ internal class MsgSvc : ProtoBuf {
) : ProtoBuf
@Serializable
- internal data class PbSendMsgResp(
+ internal class PbSendMsgResp(
@ProtoId(1) val result: Int = 0,
@ProtoId(2) val errmsg: String = "",
@ProtoId(3) val sendTime: Int = 0,