From 96d6268adb6476939217f35b5e8ef22b51c1a1b8 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 7 Feb 2020 16:59:30 +0800
Subject: [PATCH] Explicit expect function
---
.../kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt | 2 +-
.../kotlin/net/mamoe/mirai/qqandroid/BotFactory.kt | 11 ++++++++++-
.../kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/mirai-core-qqandroid/src/androidMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt b/mirai-core-qqandroid/src/androidMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt
index 4b4e5e714..99f3b33c9 100644
--- a/mirai-core-qqandroid/src/androidMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt
+++ b/mirai-core-qqandroid/src/androidMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt
@@ -12,7 +12,7 @@ import net.mamoe.mirai.utils.MiraiInternalAPI
*/
actual object QQAndroid : BotFactory {
@UseExperimental(MiraiInternalAPI::class)
- override fun Bot(context: Context, qq: Long, password: String, configuration: BotConfiguration): Bot {
+ actual override fun Bot(context: Context, qq: Long, password: String, configuration: BotConfiguration): Bot {
return QQAndroidBot(context, BotAccount(qq, password), configuration)
}
}
\ No newline at end of file
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/BotFactory.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/BotFactory.kt
index 7f3dfff81..888bad2f6 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/BotFactory.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/BotFactory.kt
@@ -1,8 +1,17 @@
package net.mamoe.mirai.qqandroid
+import net.mamoe.mirai.Bot
import net.mamoe.mirai.BotFactory
+import net.mamoe.mirai.utils.BotConfiguration
+import net.mamoe.mirai.utils.Context
/**
* QQ for Android
*/
-expect object QQAndroid : BotFactory
\ No newline at end of file
+expect object QQAndroid : BotFactory {
+
+ /**
+ * 使用指定的 [配置][configuration] 构造 [Bot] 实例
+ */
+ override fun Bot(context: Context, qq: Long, password: String, configuration: BotConfiguration): Bot
+}
\ No newline at end of file
diff --git a/mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt b/mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt
index e7429f133..94b2fce42 100644
--- a/mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt
+++ b/mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroid.kt
@@ -15,7 +15,7 @@ import net.mamoe.mirai.utils.MiraiInternalAPI
@UseExperimental(MiraiInternalAPI::class)
actual object QQAndroid : BotFactory {
- override fun Bot(context: Context, qq: Long, password: String, configuration: BotConfiguration): Bot {
+ actual override fun Bot(context: Context, qq: Long, password: String, configuration: BotConfiguration): Bot {
return QQAndroidBot(context, BotAccount(qq, password), configuration)
}