From 3a9a41c08f60a6db39ccf9bf3d4933d28a893219 Mon Sep 17 00:00:00 2001
From: jzxc95 <907297917@qq.com>
Date: Tue, 26 Sep 2023 09:46:37 +0800
Subject: [PATCH] =?UTF-8?q?merge:=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/mobilehotspot/mobilehotspotwidget.h |   4 ----
 plugins/vpn/translations/zh_CN.qm           | Bin 559 -> 0 bytes
 plugins/vpn/translations/zh_CN.ts           |   9 ---------
 src/frontend/netdetails/ipv4page.cpp        |  21 +-------------------
 src/frontend/netdetails/netdetail.cpp       |   8 --------
 src/src.pro                                 |   3 ---
 6 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 plugins/vpn/translations/zh_CN.qm

diff --git a/plugins/mobilehotspot/mobilehotspotwidget.h b/plugins/mobilehotspot/mobilehotspotwidget.h
index 5b3391d1..0723b2fd 100644
--- a/plugins/mobilehotspot/mobilehotspotwidget.h
+++ b/plugins/mobilehotspot/mobilehotspotwidget.h
@@ -143,12 +143,8 @@ private:
     void deleteSettingPathInterface();
     void initConnectDevPage();
     void initBlackListPage();
-<<<<<<< HEAD
-=======
 
     bool m_isUserSelect = true;  //是否用户操作
-
->>>>>>> a7566033f9be861633342d27c57493da3250193c
 signals:
 
 private slots:
diff --git a/plugins/vpn/translations/zh_CN.qm b/plugins/vpn/translations/zh_CN.qm
deleted file mode 100644
index e0162a9baa66c26f027c8df2959191f4cd10bb06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 559
zcmcE7ks@*G{hX<16=n7(EZlq7iGhJ3f`K904@mE3(ml|^z`!WYvPNeqkj`cGK5zvn
zevLJ6+Gilmz|K-O1xWp6Ulz>=q(iw9f13c+P3B7VegdT3c;p$CfZ{FuLO*8%X^l*v
z;9lncK)?ayGOz(Lmt#tbf`3UyYEdyekjn|=`lXgQmE<v^s^bT#3(qV{1xe=@Wuq$w
z8I}7xXaPeQLjZ#x+<117wy*#{uyW6m)Lgfs#N1RyW}tF`a1FoTK?^hZ)9fm(!v1Bj
z!!_{-XXKYF<mV}bBo=2UB^H4+GlvzRJBb-;E<_5bhAs9}|Gng;aC115^YijjlS@)l
zaG1cBnOl%wRDzHN8IrDrVhC?ueu)AWgMdm|P!zH|Lu><?#tw8X$hTmRvIHqiOMyFz
b%_TJ_wImf&RqEP!2DmCNm&{_Qr6?)^%}<27

diff --git a/plugins/vpn/translations/zh_CN.ts b/plugins/vpn/translations/zh_CN.ts
index f13129d5..ef0e9b29 100644
--- a/plugins/vpn/translations/zh_CN.ts
+++ b/plugins/vpn/translations/zh_CN.ts
@@ -36,17 +36,8 @@
         <translation></translation>
     </message>
     <message>
-<<<<<<< HEAD
-        <location filename="../vpn.cpp" line="68"/>
-        <source>VPN</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../vpn.cpp" line="151"/>
-=======
         <location filename="../vpn.cpp" line="157"/>
         <location filename="../vpn.cpp" line="284"/>
->>>>>>> a7566033f9be861633342d27c57493da3250193c
         <source>Show on Taskbar</source>
         <translation>在任务栏显示图标</translation>
         <extra-contents_path>/Vpn/Show on Taskbar</extra-contents_path>
diff --git a/src/frontend/netdetails/ipv4page.cpp b/src/frontend/netdetails/ipv4page.cpp
index 1b879823..14e032e3 100644
--- a/src/frontend/netdetails/ipv4page.cpp
+++ b/src/frontend/netdetails/ipv4page.cpp
@@ -192,27 +192,8 @@ bool Ipv4Page::checkIsChanged(const ConInfo info, KyConnectSetting &setting)
         type = CONFIG_IP_MANUAL;
         if (info.ipv4ConfigType != CONFIG_IP_MANUAL) {
             qDebug() << "ipv4ConfigType change to Manual";
-<<<<<<< HEAD
-            setting.setIpConfigType(IPADDRESS_V4, CONFIG_IP_MANUAL);
-            isChanged =  true;
-        }
-        qDebug() << "ipv4 netmask " << getNetMaskText(netMaskEdit->text());
-
-        if(info.strIPV4Address != ipv4addressEdit->text()
-                || info.strIPV4NetMask != /*netMaskEdit->text()*/getNetMaskText(netMaskEdit->text())
-                || info.strIPV4GateWay != gateWayEdit->text()) {
-
-            qDebug() << "ipv4 info changed";
-
-            QString ipv4address =ipv4addressEdit->text();
-            QString netMask = getNetMaskText(netMaskEdit->text());
-            QString gateWay = gateWayEdit->text();
-            qDebug() << ipv4address << netMask << gateWay;
-            setting.ipv4AddressConstruct(ipv4address, netMask, gateWay);
-            setting.dumpInfo();
             isChanged =  true;
         } else {
-
             if(info.strIPV4Address != ipv4addressEdit->text()
                     || info.strIPV4NetMask != getNetMaskText(netMaskEdit->text())
                     || info.strIPV4GateWay != gateWayEdit->text()) {
@@ -224,7 +205,7 @@ bool Ipv4Page::checkIsChanged(const ConInfo info, KyConnectSetting &setting)
 
     QList<QHostAddress> ipv4dnsList;
     ipv4dnsList.clear();
-    ipv4dnsList = m_dnsWidget->getDns();
+        ipv4dnsList = m_dnsWidget->getDns();
     if(info.ipv4DnsList != ipv4dnsList) {
         isChanged = true;
     }
diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp
index 2a0fd373..2bd62d1a 100644
--- a/src/frontend/netdetails/netdetail.cpp
+++ b/src/frontend/netdetails/netdetail.cpp
@@ -788,11 +788,7 @@ void NetDetail::initSecuData()
             initTlsInfo(m_info);
         } else if (m_info.enterpriseType == PEAP) {
             initPeapInfo(m_info);
-<<<<<<< HEAD
-        } else  if (m_info.enterpriseType == TTLS){
-=======
         } else if (m_info.enterpriseType == TTLS) {
->>>>>>> a7566033f9be861633342d27c57493da3250193c
             initTtlsInfo(m_info);
         } else if (m_info.enterpriseType == LEAP) {
             initLeapInfo(m_info);
@@ -964,11 +960,7 @@ void NetDetail::updateWirelessEnterPriseConnect(KyEapMethodType enterpriseType)
         securityPage->updateFastChange(m_info.fastInfo);
         m_wirelessConnOpration->updateWirelessEnterPriseFastConnect(m_uuid, m_info.fastInfo);
     } else {
-<<<<<<< HEAD
-        qWarning() << "[NetDetail] unknow enterprise connection type";
-=======
         qWarning() << "[NetDetail] unknown enterprise connection type" << enterpriseType;
->>>>>>> a7566033f9be861633342d27c57493da3250193c
     }
 }
 
diff --git a/src/src.pro b/src/src.pro
index c5b17267..bfeaabda 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -21,14 +21,11 @@ INCLUDEPATH += /usr/include/KF5/NetworkManagerQt
 
 LIBS    +=  -L/usr/lib/ -lgsettings-qt -lX11 -lKF5NetworkManagerQt -lukui-log4qt
 #LIBS  +=  -lkysec
-<<<<<<< HEAD
-=======
 
 CONFIG(release, debug|release) {
     !system($$PWD/translate_generation.sh): error("Failed to generate translation")
 }
 
->>>>>>> a7566033f9be861633342d27c57493da3250193c
 target.path = /usr/bin
 target.source += $$TARGET
 desktop.path = /etc/xdg/autostart/