fix: Adapt to build for Qt 6.8.3

XMuli · XMuli · commit 515f3173602b · 2025-10-20T22:40:14.000+08:00
diff --git a/AboutAuthor.cpp b/AboutAuthor.cpp
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/AboutAuthor.h b/AboutAuthor.h
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/AboutAuthor.ui b/AboutAuthor.ui
@@ -37,7 +37,7 @@ li.unchecked::marker { content: &quot;\2610&quot;; }
 li.checked::marker { content: &quot;\2612&quot;; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'华文楷体';&quot;&gt;作者:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'华文楷体';&quot;&gt;    Copyright © 2019-2024  &lt;/span&gt;&lt;a href=&quot;https://github.com/XMuli&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;偕臧&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'华文楷体';&quot;&gt; &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'华文楷体';&quot;&gt;    Copyright © 2019-2025  &lt;/span&gt;&lt;a href=&quot;https://github.com/XMuli&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;偕臧&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'华文楷体';&quot;&gt; &lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'华文楷体'; text-decoration: underline; color:#007af4;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'FangSong';&quot;&gt;贡献者: &lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'FangSong';&quot;&gt;    - &lt;/span&gt;&lt;a href=&quot;https://github.com/Bruce-Ch&quot;&gt;&lt;span style=&quot; font-family:'FangSong'; text-decoration: underline; color:#007af4;&quot;&gt;Bruce-Ch&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,19 +4,20 @@
 # 关于作者:
 # 偕臧 xmulitech@gmail.com
 # 项目完成时间: 2019-02-01
-# 功能更新时间: 2024-01-24
+# 功能更新时间: 2025-10-20
 # 其他:如果觉得该作品对你有用，或者有疑惑或者感谢，可以联系作者或者打赏;
 #     对我的 Star 和 Fork 是最大鼓励；当然有人欢迎你提交在 GitHub 提交 PR,
 #     已将源码和思路开源公布于我的github和博客，供大家学习参考
 #
 # 联系作者:
 # GitHub:        https://github.com/XMuli/ChineseChess
 # Site:          https://chinesechess.xmuli.tech
+# More Products  https://product.xmuli.tech
 # Telegram:      https://t.me/xmuli
 # CSDN Bolg:     https://blog.csdn.net/qq_33154343
 # My Blog:       https://xmuli.tech
 #-------------------------------------------------
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.25)
 
 set(project_name ChineseChess)
 set(project_version_major 6)
@@ -41,7 +42,7 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR})                      # 创建输出目
 # 需要配置环境变量QT5_DIR
 #set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT5_DIR})
 
-set(qt_moduls Widgets Gui OpenGL  Network Xml Svg Multimedia)                        # Network Multimedia WebSockets
+set(qt_moduls Core Gui Widgets OpenGL Network Xml Svg Multimedia)                        # Network Multimedia WebSockets
 set(qt_version_moduls)
 foreach(it ${qt_moduls})
     list(APPEND qt_version_moduls Qt${QT_VERSION_MAJOR}::${it})
diff --git a/ChessBoard.cpp b/ChessBoard.cpp
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/ChessBoard.h b/ChessBoard.h
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/ChessPieces.cpp b/ChessPieces.cpp
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/ChessPieces.h b/ChessPieces.h
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/ChessStep.cpp b/ChessStep.cpp
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/ChessStep.h b/ChessStep.h
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/ChessVoice.cpp b/ChessVoice.cpp
@@ -1,51 +1,69 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
 #include "ChessVoice.h"
 
-ChessVoice::ChessVoice(QObject *parent) : QObject(parent)
+ChessVoice::ChessVoice(QObject *parent)
+    : QObject(parent)
 {
+    // 注意：资源路径用 qrc 前缀（已在资源文件 .qrc 中配置）
+    m_win.setSource(QUrl(QStringLiteral("qrc:/sound/WinSound.wav")));
+    m_select.setSource(QUrl(QStringLiteral("qrc:/sound/selectChess.wav")));
+    m_move.setSource(QUrl(QStringLiteral("qrc:/sound/moveChess.wav")));
+    m_eat.setSource(QUrl(QStringLiteral("qrc:/sound/eatChess.wav")));
+    m_back.setSource(QUrl(QStringLiteral("qrc:/sound/backChess.wav")));
+    m_general.setSource(QUrl(QStringLiteral("qrc:/sound/generalSound.wav")));
 
+    // 设置音量（0.0 至 1.0）
+    m_win.setVolume(1.0f);
+    m_select.setVolume(1.0f);
+    m_move.setVolume(1.0f);
+    m_eat.setVolume(1.0f);
+    m_back.setVolume(1.0f);
+    m_general.setVolume(1.0f);
+
+    // 可选：预加载或设置 loopCount 等，下面为一次播放
+    m_win.setLoopCount(1);
+    m_select.setLoopCount(1);
+    m_move.setLoopCount(1);
+    m_eat.setLoopCount(1);
+    m_back.setLoopCount(1);
+    m_general.setLoopCount(1);
 }
-ChessVoice:: ~ChessVoice()
-{
 
+ChessVoice::~ChessVoice()
+{
+    // QSoundEffect 自动析构，成员变量无需手动 delete
 }
 
-void ChessVoice:: voiceWin()
+void ChessVoice::voiceWin()
 {
-    if(m_win!= nullptr)
-        this->m_win->play();
+    m_win.play();
 }
 
 void ChessVoice::voiceSelect()
 {
-    if(m_select!= nullptr)
-        this->m_select->play();
+    m_select.play();
 }
 
-void ChessVoice:: voiceMove()
+void ChessVoice::voiceMove()
 {
-    if(m_move!= nullptr)
-        this->m_move->play();
+    m_move.play();
 }
 
-void ChessVoice:: voiceEat()
+void ChessVoice::voiceEat()
 {
-    if(m_eat!= nullptr)
-        this->m_eat->play();
+    m_eat.play();
 }
 
-void ChessVoice:: voiceBack()
+void ChessVoice::voiceBack()
 {
-    if(m_back!= nullptr)
-        this->m_back->play();
+    m_back.play();
 }
 
-void ChessVoice:: voiceGeneral()
+void ChessVoice::voiceGeneral()
 {
-    if(m_general!= nullptr)
-        this->m_general->play();
+    m_general.play();
 }
diff --git a/ChessVoice.h b/ChessVoice.h
@@ -1,13 +1,14 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
 #ifndef CHESSVOICE_H
 #define CHESSVOICE_H
 
 #include <QObject>
-#include <QSound>
+#include <QSoundEffect>
+#include <QUrl>
 
 class ChessVoice : public QObject
 {
@@ -16,20 +17,20 @@ class ChessVoice : public QObject
     explicit ChessVoice(QObject *parent = nullptr);
     ~ChessVoice();
 
-    QSound *m_win =new QSound(":/sound/WinSound.wav",this);
-    QSound *m_select =new QSound(":/sound/selectChess.wav",this);
-    QSound *m_move =new QSound(":/sound/moveChess.wav",this);
-    QSound *m_eat =new QSound(":/sound/eatChess.wav",this);
-    QSound *m_back =new QSound(":/sound/backChess.wav",this);
-    QSound *m_general =new QSound(":/sound/generalSound.wav",this);
-
     void voiceWin();      // 胜利音效
     void voiceSelect();   // 选棋音效
     void voiceMove();     // 移动音效
     void voiceEat();      // 吃子音效
     void voiceBack();     // 悔棋音效
     void voiceGeneral();  // 将军音效
-	
+
+private:
+    QSoundEffect m_win;
+    QSoundEffect m_select;
+    QSoundEffect m_move;
+    QSoundEffect m_eat;
+    QSoundEffect m_back;
+    QSoundEffect m_general;
 };
 
 #endif // CHESSVOICE_H
diff --git a/ChineseChess.pro b/ChineseChess.pro
diff --git a/ChooseMainWindow.cpp b/ChooseMainWindow.cpp
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/ChooseMainWindow.h b/ChooseMainWindow.h
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/MachineGame.cpp b/MachineGame.cpp
@@ -1,9 +1,10 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
 #include "MachineGame.h"
+#include <QRandomGenerator>
 
 MachineGame::MachineGame()
 {
@@ -261,8 +262,9 @@ ChessStep* MachineGame::getBestMove()
     //2.试着走一下
     //从这种不击杀红棋子，只是单纯移动黑棋steps里面，随机抽选一种进行下棋
     int nStepsCount = stepsAndNoKill.count();
-    qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); //随机数种子, 0~MAX
-    int temp =qrand()% nStepsCount;
+    // qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); //随机数种子, 0~MAX
+    // int temp =qrand()% nStepsCount;
+    int temp = QRandomGenerator::global()->bounded(nStepsCount);
     QVector<ChessStep*>::iterator it = stepsAndNoKill.begin();
     retStep = it[temp];
 
diff --git a/MachineGame.h b/MachineGame.h
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/NetworkGame.cpp b/NetworkGame.cpp
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/NetworkGame.h b/NetworkGame.h
@@ -1,5 +1,5 @@
 ﻿// SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
+// SPDX-FileCopyrightText: 2019-2025 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <xmulitech@gmail.com>
 
diff --git a/chooseresource.qrc b/chooseresource.qrc
diff --git a/convert_to_utf8_bom.py b/convert_to_utf8_bom.py
diff --git a/main.cpp b/main.cpp
