diff --git a/debian/changelog b/debian/changelog index 6a3f880..1f35028 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +kylin-scanner (3.2.0.4-ok4) yangtze; urgency=medium + + * BUG号:无 + * 需求号:无 + * 其他改动说明:编译错误修改 + * 其他改动影响域:无 + + -- zhaoyuzhen Mon, 19 Jul 2022 10:39:12 +0800 + kylin-scanner (3.2.0.4-ok3) yangtze; urgency=medium * BUG号:#109782 【用户手册】【摄像头】用户手册首页摄像头的图标icon需替换为寻光主题图标 diff --git a/kabase/Qt/log.hpp b/kabase/Qt/kabaselog.hpp similarity index 94% rename from kabase/Qt/log.hpp rename to kabase/Qt/kabaselog.hpp index a0ccd88..5bef3c0 100644 --- a/kabase/Qt/log.hpp +++ b/kabase/Qt/kabaselog.hpp @@ -13,11 +13,11 @@ namespace kabase { -class Log +class KabaseLog { public: - Log() = default; - ~Log() = default; + KabaseLog() = default; + ~KabaseLog() = default; static void logOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -50,4 +50,4 @@ public: } -#endif \ No newline at end of file +#endif diff --git a/src/main.cpp b/src/main.cpp index e55251e..eb19989 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -38,7 +38,7 @@ #include #include #include -#include "log.hpp" +#include "kabaselog.hpp" #include "windowmanage.hpp" #include #include @@ -150,7 +150,7 @@ static QString getAppVersion() int main(int argc, char *argv[]) { /* 使用sdk管理日志 */ - qInstallMessageHandler(::kabase::Log::logOutput); + qInstallMessageHandler(::kabase::KabaseLog::logOutput); QString scannerFileName; if (argc > 1) {