Merge pull request #166 from NekoSilverFox/MengJianing

修复颜色对话框造成的内存泄漏问题
nekosilverfox · May 17, 2024 · d203998 · d203998
2 parents 6428f31 + 0894ff1
commit d203998
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 28 deletions.
diff --git a/App/bll_polychat.h b/App/bll_polychat.h
@@ -17,37 +17,18 @@ static QHostAddress getIPAddress()
 {
     QHostAddress ipAddress;
     QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
-
-    // 优先寻找以192开头的IPv4地址
-    for (const QHostAddress &address : ipAddressesList)
+    for (int i = 0; i < ipAddressesList.size(); ++i)
     {
-        if (address != QHostAddress::LocalHost && address.toIPv4Address())
+        if (ipAddressesList.at(i) != QHostAddress::LocalHost
+            && ipAddressesList.at(i).toIPv4Address())
         {
-            QString ipString = address.toString();
-            if (ipString.startsWith("192"))
-            {
-                ipAddress = address;
-                break;
-            }
-        }
-    }
-
-    // 如果没有找到以192开头的地址，再考虑其他IPv4地址
-    if (ipAddress.isNull())
-    {
-        for (const QHostAddress &address : ipAddressesList) {
-            if (address != QHostAddress::LocalHost && address.toIPv4Address())
-            {
-                ipAddress = address;
-                break;
-            }
+            ipAddress = ipAddressesList.at(i);
+            break;
         }
     }
 
-    // 如果仍然没有找到，返回 localhost IPv4 地址
-    if (ipAddress.isNull()) {
+    if (ipAddress.toString().isEmpty())
         ipAddress = QHostAddress(QHostAddress::LocalHost);
-    }
 
     return ipAddress;
 }

diff --git a/App/main.cpp b/App/main.cpp
@@ -1,5 +1,6 @@
 #include <QApplication>
 #include <QTranslator>
+#include <QHostInfo>
 
 #include "uil_chatboxwidget.h"
 #include "uil_loginwidget.h"
@@ -11,15 +12,20 @@
 QString      localUserName           = "";               // User Name (will get in user login)
 QString      localUserGroupNumber    = "";               // Group number (will get in user login)
 QHostAddress localIpAddress          = QHostAddress();
+QString      localHostName           = QHostInfo::localHostName();
+
 ChatList*    chatList                = nullptr;          // Widget ChatList (Only one)
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     a.setWindowIcon(QIcon(":/icon/icons/logo_fox.png"));
 
-//    QString appDirPath = QCoreApplication::applicationDirPath();   //程序所在路径
-//    qDebug() << appDirPath;
+#if !QT_NO_DEBUG
+    qDebug() << "[Debug] appDirPath: " << QCoreApplication::applicationDirPath();   //程序所在路径
+    qDebug() << "[Debug] localHostName: "<<localHostName;
+    qDebug() << "[Debug] QHostAddress::LocalHost: " << QHostAddress::LocalHost;
+#endif
 
     LoginWidget login;
     login.show();

diff --git a/App/uil_chatboxwidget.cpp b/App/uil_chatboxwidget.cpp
@@ -97,7 +97,7 @@ ChatBoxWidget::ChatBoxWidget(QWidget* parent, QString name, qint16 port)
     /* 更改颜色 */
     connect(ui->btnColor, &QToolButton::clicked,
             this, [=](){
-        QColor color = QColorDialog::getColor(Qt::black);  // getColor 参数中颜色是默认开启颜色对话框中的颜色
+                        QColor color = QColorDialog::getColor(Qt::black, this);  // getColor 参数中颜色是默认开启颜色对话框中的颜色
                         ui->msgTextEdit->setTextColor(color);
     });
 

diff --git a/App/uil_loginwidget.cpp b/App/uil_loginwidget.cpp
@@ -59,6 +59,7 @@ LoginWidget::LoginWidget(QWidget *parent) :
     connect(ui->btnLogin, &QPushButton::clicked,
             this, &LoginWidget::userLogin);
 
+    /* User checked button `about` */
     connect(ui->btnInfo, &QPushButton::clicked,
             this, [=](){
         QMessageBox::about(this, "About Polychat",

diff --git a/report.info b/report.info