merge:解决冲突

plugins/mobilehotspot/mobilehotspotwidget.h

@@ -143,12 +143,8 @@ private:
     void deleteSettingPathInterface();
     void initConnectDevPage();
     void initBlackListPage();
-<<<<<<< HEAD
-=======
 
     bool m_isUserSelect = true;  //是否用户操作
-
->>>>>>> a7566033f9be861633342d27c57493da3250193c
 signals:
 
 private slots:

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>

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()) {

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
     }
 }
 

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/