VirtualBox

Changeset 66697 in vbox


Ignore:
Timestamp:
Apr 27, 2017 3:46:33 PM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
115090
Message:

FE/Qt: bugref:8847: Host Network Manager: Some coding-style cleanup (mostly renaming long variable names).

Location:
trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp

    r66681 r66697  
    55
    66/*
    7  * Copyright (C) 2009-2016 Oracle Corporation
     7 * Copyright (C) 2009-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    360360
    361361    /* Load 'DHCP server' data: */
    362     m_pCheckBoxDHCP->setChecked(m_data.m_dhcpserver.m_fDhcpServerEnabled);
     362    m_pCheckBoxDHCP->setChecked(m_data.m_dhcpserver.m_fEnabled);
    363363    loadDataForDHCPServer();
    364364}
    … …  
    366366void UIHostNetworkDetailsDialog::loadDataForInterface()
    367367{
    368     /* IPv4 fields: */
    369     m_pEditorIPv4->setText(m_data.m_interface.m_strInterfaceAddress);
    370     m_pEditorNMv4->setText(m_data.m_interface.m_strInterfaceMask);
    371 
    372     /* IPv6 fields: */
    373     const bool fIsIpv6Supported = m_data.m_interface.m_fIpv6Supported;
     368    /* Load IPv4 interface fields: */
     369    m_pEditorIPv4->setText(m_data.m_interface.m_strAddress);
     370    m_pEditorNMv4->setText(m_data.m_interface.m_strMask);
     371
     372    /* Toggle IPv6 interface fields availability: */
     373    const bool fIsIpv6Supported = m_data.m_interface.m_fSupportedIPv6;
    374374    m_pLabelIPv6->setEnabled(fIsIpv6Supported);
    375375    m_pLabelNMv6->setEnabled(fIsIpv6Supported);
    … …  
    378378    if (fIsIpv6Supported)
    379379    {
    380         /* Load old values: */
    381         m_pEditorIPv6->setText(m_data.m_interface.m_strInterfaceAddress6);
    382         m_pEditorNMv6->setText(m_data.m_interface.m_strInterfaceMaskLength6);
     380        /* Load IPv6 interface fields: */
     381        m_pEditorIPv6->setText(m_data.m_interface.m_strAddress6);
     382        m_pEditorNMv6->setText(m_data.m_interface.m_strMaskLength6);
    383383    }
    384384}
    … …  
    386386void UIHostNetworkDetailsDialog::loadDataForDHCPServer()
    387387{
    388     /* DHCP server fields: */
     388    /* Toggle DHCP server fields availability: */
    389389    const bool fIsManual = m_pCheckBoxDHCP->isChecked();
    390390    m_pLabelDHCPAddress->setEnabled(fIsManual);
    … …  
    398398    if (fIsManual)
    399399    {
    400         /* Load old values: */
    401         m_pEditorDHCPAddress->setText(m_data.m_dhcpserver.m_strDhcpServerAddress);
    402         m_pEditorDHCPMask->setText(m_data.m_dhcpserver.m_strDhcpServerMask);
    403         m_pEditorDHCPLowerAddress->setText(m_data.m_dhcpserver.m_strDhcpLowerAddress);
    404         m_pEditorDHCPUpperAddress->setText(m_data.m_dhcpserver.m_strDhcpUpperAddress);
     400        /* Load DHCP server fields: */
     401        m_pEditorDHCPAddress->setText(m_data.m_dhcpserver.m_strAddress);
     402        m_pEditorDHCPMask->setText(m_data.m_dhcpserver.m_strMask);
     403        m_pEditorDHCPLowerAddress->setText(m_data.m_dhcpserver.m_strLowerAddress);
     404        m_pEditorDHCPUpperAddress->setText(m_data.m_dhcpserver.m_strUpperAddress);
    405405
    406406        /* Invent default values where necessary: */
    407         const quint32 uAddr = ipv4FromQStringToQuint32(m_data.m_interface.m_strInterfaceAddress);
    408         const quint32 uMask = ipv4FromQStringToQuint32(m_data.m_interface.m_strInterfaceMask);
     407        const quint32 uAddr = ipv4FromQStringToQuint32(m_data.m_interface.m_strAddress);
     408        const quint32 uMask = ipv4FromQStringToQuint32(m_data.m_interface.m_strMask);
    409409        const quint32 uProp = uAddr & uMask;
    410410        const QString strMask = ipv4FromQuint32ToQString(uMask);
    … …  
    413413        //       strProp.toUtf8().constData(),
    414414        //       strMask.toUtf8().constData());
    415         if (   m_data.m_dhcpserver.m_strDhcpServerAddress.isEmpty()
    416             || m_data.m_dhcpserver.m_strDhcpServerAddress == "0.0.0.0")
     415        if (   m_data.m_dhcpserver.m_strAddress.isEmpty()
     416            || m_data.m_dhcpserver.m_strAddress == "0.0.0.0")
    417417            m_pEditorDHCPAddress->setText(strProp);
    418         if (   m_data.m_dhcpserver.m_strDhcpServerMask.isEmpty()
    419             || m_data.m_dhcpserver.m_strDhcpServerMask == "0.0.0.0")
     418        if (   m_data.m_dhcpserver.m_strMask.isEmpty()
     419            || m_data.m_dhcpserver.m_strMask == "0.0.0.0")
    420420            m_pEditorDHCPMask->setText(strMask);
    421         if (   m_data.m_dhcpserver.m_strDhcpLowerAddress.isEmpty()
    422             || m_data.m_dhcpserver.m_strDhcpLowerAddress == "0.0.0.0")
     421        if (   m_data.m_dhcpserver.m_strLowerAddress.isEmpty()
     422            || m_data.m_dhcpserver.m_strLowerAddress == "0.0.0.0")
    423423            m_pEditorDHCPLowerAddress->setText(strProp);
    424         if (   m_data.m_dhcpserver.m_strDhcpUpperAddress.isEmpty()
    425             || m_data.m_dhcpserver.m_strDhcpUpperAddress == "0.0.0.0")
     424        if (   m_data.m_dhcpserver.m_strUpperAddress.isEmpty()
     425            || m_data.m_dhcpserver.m_strUpperAddress == "0.0.0.0")
    426426            m_pEditorDHCPUpperAddress->setText(strProp);
    427427    }
    … …  
    437437void UIHostNetworkDetailsDialog::save()
    438438{
    439     /* Interface data: */
    440     m_data.m_interface.m_strInterfaceAddress = m_pEditorIPv4->text();
    441     m_data.m_interface.m_strInterfaceMask = m_pEditorNMv4->text();
    442     if (m_data.m_interface.m_fIpv6Supported)
    443     {
    444         m_data.m_interface.m_strInterfaceAddress6 = m_pEditorIPv6->text();
    445         m_data.m_interface.m_strInterfaceMaskLength6 = m_pEditorNMv6->text();
    446     }
    447 
    448     /* Server data: */
    449     m_data.m_dhcpserver.m_fDhcpServerEnabled = m_pCheckBoxDHCP->isChecked();
    450     if (m_data.m_dhcpserver.m_fDhcpServerEnabled)
    451     {
    452         m_data.m_dhcpserver.m_strDhcpServerAddress = m_pEditorDHCPAddress->text();
    453         m_data.m_dhcpserver.m_strDhcpServerMask = m_pEditorDHCPMask->text();
    454         m_data.m_dhcpserver.m_strDhcpLowerAddress = m_pEditorDHCPLowerAddress->text();
    455         m_data.m_dhcpserver.m_strDhcpUpperAddress = m_pEditorDHCPUpperAddress->text();
     439    /* Save interface data: */
     440    m_data.m_interface.m_strAddress = m_pEditorIPv4->text();
     441    m_data.m_interface.m_strMask = m_pEditorNMv4->text();
     442    if (m_data.m_interface.m_fSupportedIPv6)
     443    {
     444        m_data.m_interface.m_strAddress6 = m_pEditorIPv6->text();
     445        m_data.m_interface.m_strMaskLength6 = m_pEditorNMv6->text();
     446    }
     447
     448    /* Save DHCP server data: */
     449    m_data.m_dhcpserver.m_fEnabled = m_pCheckBoxDHCP->isChecked();
     450    if (m_data.m_dhcpserver.m_fEnabled)
     451    {
     452        m_data.m_dhcpserver.m_strAddress = m_pEditorDHCPAddress->text();
     453        m_data.m_dhcpserver.m_strMask = m_pEditorDHCPMask->text();
     454        m_data.m_dhcpserver.m_strLowerAddress = m_pEditorDHCPLowerAddress->text();
     455        m_data.m_dhcpserver.m_strUpperAddress = m_pEditorDHCPUpperAddress->text();
    456456    }
    457457}

  • trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.h

    r66681 r66697  
    3636    UIDataHostNetworkInterface()
    3737        : m_strName(QString())
    38         , m_strInterfaceAddress(QString())
    39         , m_strInterfaceMask(QString())
    40         , m_fIpv6Supported(false)
    41         , m_strInterfaceAddress6(QString())
    42         , m_strInterfaceMaskLength6(QString())
     38        , m_strAddress(QString())
     39        , m_strMask(QString())
     40        , m_fSupportedIPv6(false)
     41        , m_strAddress6(QString())
     42        , m_strMaskLength6(QString())
    4343    {}
    4444
    … …  
    4848        return true
    4949               && (m_strName == other.m_strName)
    50                && (m_strInterfaceAddress == other.m_strInterfaceAddress)
    51                && (m_strInterfaceMask == other.m_strInterfaceMask)
    52                && (m_fIpv6Supported == other.m_fIpv6Supported)
    53                && (m_strInterfaceAddress6 == other.m_strInterfaceAddress6)
    54                && (m_strInterfaceMaskLength6 == other.m_strInterfaceMaskLength6)
     50               && (m_strAddress == other.m_strAddress)
     51               && (m_strMask == other.m_strMask)
     52               && (m_fSupportedIPv6 == other.m_fSupportedIPv6)
     53               && (m_strAddress6 == other.m_strAddress6)
     54               && (m_strMaskLength6 == other.m_strMaskLength6)
    5555               ;
    5656    }
    … …  
    6161    bool operator!=(const UIDataHostNetworkInterface &other) const { return !equal(other); }
    6262
    63     /** Holds host interface name. */
     63    /** Holds interface name. */
    6464    QString m_strName;
    6565    /** Holds IPv4 interface address. */
    66     QString m_strInterfaceAddress;
     66    QString m_strAddress;
    6767    /** Holds IPv4 interface mask. */
    68     QString m_strInterfaceMask;
     68    QString m_strMask;
    6969    /** Holds whether IPv6 protocol supported. */
    70     bool m_fIpv6Supported;
     70    bool m_fSupportedIPv6;
    7171    /** Holds IPv6 interface address. */
    72     QString m_strInterfaceAddress6;
     72    QString m_strAddress6;
    7373    /** Holds IPv6 interface mask length. */
    74     QString m_strInterfaceMaskLength6;
     74    QString m_strMaskLength6;
    7575};
    7676
    … …  
    8181    /** Constructs data. */
    8282    UIDataDHCPServer()
    83         : m_fDhcpServerEnabled(false)
    84         , m_strDhcpServerAddress(QString())
    85         , m_strDhcpServerMask(QString())
    86         , m_strDhcpLowerAddress(QString())
    87         , m_strDhcpUpperAddress(QString())
     83        : m_fEnabled(false)
     84        , m_strAddress(QString())
     85        , m_strMask(QString())
     86        , m_strLowerAddress(QString())
     87        , m_strUpperAddress(QString())
    8888    {}
    8989
    … …  
    9292    {
    9393        return true
    94                && (m_fDhcpServerEnabled == other.m_fDhcpServerEnabled)
    95                && (m_strDhcpServerAddress == other.m_strDhcpServerAddress)
    96                && (m_strDhcpServerMask == other.m_strDhcpServerMask)
    97                && (m_strDhcpLowerAddress == other.m_strDhcpLowerAddress)
    98                && (m_strDhcpUpperAddress == other.m_strDhcpUpperAddress)
     94               && (m_fEnabled == other.m_fEnabled)
     95               && (m_strAddress == other.m_strAddress)
     96               && (m_strMask == other.m_strMask)
     97               && (m_strLowerAddress == other.m_strLowerAddress)
     98               && (m_strUpperAddress == other.m_strUpperAddress)
    9999               ;
    100100    }
    … …  
    106106
    107107    /** Holds whether DHCP server enabled. */
    108     bool m_fDhcpServerEnabled;
     108    bool m_fEnabled;
    109109    /** Holds DHCP server address. */
    110     QString m_strDhcpServerAddress;
     110    QString m_strAddress;
    111111    /** Holds DHCP server mask. */
    112     QString m_strDhcpServerMask;
     112    QString m_strMask;
    113113    /** Holds DHCP server lower address. */
    114     QString m_strDhcpLowerAddress;
     114    QString m_strLowerAddress;
    115115    /** Holds DHCP server upper address. */
    116     QString m_strDhcpUpperAddress;
     116    QString m_strUpperAddress;
    117117};
    118118

  • trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

    r66696 r66697  
    8686    /* Compose item fields: */
    8787    setText(Column_Name, m_interface.m_strName);
    88     setText(Column_IPv4, QString("%1/%2").arg(m_interface.m_strInterfaceAddress).arg(maskToCidr(m_interface.m_strInterfaceMask)));
    89     setText(Column_IPv6, !m_interface.m_fIpv6Supported ? QString() :
    90                          QString("%1/%2").arg(m_interface.m_strInterfaceAddress6).arg(maskToCidr(m_interface.m_strInterfaceMaskLength6)));
     88    setText(Column_IPv4, QString("%1/%2").arg(m_interface.m_strAddress).arg(maskToCidr(m_interface.m_strMask)));
     89    setText(Column_IPv6, !m_interface.m_fSupportedIPv6 ? QString() :
     90                         QString("%1/%2").arg(m_interface.m_strAddress6).arg(maskToCidr(m_interface.m_strMaskLength6)));
    9191    setText(Column_DHCP, UIHostNetworkManager::tr("Enable", "DHCP Server"));
    92     setCheckState(Column_DHCP, m_dhcpserver.m_fDhcpServerEnabled ? Qt::Checked : Qt::Unchecked);
     92    setCheckState(Column_DHCP, m_dhcpserver.m_fEnabled ? Qt::Checked : Qt::Unchecked);
    9393
    9494    /* Compose item tool-tip: */
    … …  
    102102                           .arg(UIHostNetworkManager::tr("Manually configured", "interface"));
    103103    strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("IPv4 Address"))
    104                               .arg(m_interface.m_strInterfaceAddress.isEmpty() ?
     104                              .arg(m_interface.m_strAddress.isEmpty() ?
    105105                                   UIHostNetworkManager::tr ("Not set", "address") :
    106                                    m_interface.m_strInterfaceAddress) +
     106                                   m_interface.m_strAddress) +
    107107                  strSubHeader.arg(UIHostNetworkManager::tr("IPv4 Network Mask"))
    108                               .arg(m_interface.m_strInterfaceMask.isEmpty() ?
     108                              .arg(m_interface.m_strMask.isEmpty() ?
    109109                                   UIHostNetworkManager::tr ("Not set", "mask") :
    110                                    m_interface.m_strInterfaceMask);
    111     if (m_interface.m_fIpv6Supported)
     110                                   m_interface.m_strMask);
     111    if (m_interface.m_fSupportedIPv6)
    112112    {
    113113        strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("IPv6 Address"))
    114                                   .arg(m_interface.m_strInterfaceAddress6.isEmpty() ?
     114                                  .arg(m_interface.m_strAddress6.isEmpty() ?
    115115                                       UIHostNetworkManager::tr("Not set", "address") :
    116                                        m_interface.m_strInterfaceAddress6) +
     116                                       m_interface.m_strAddress6) +
    117117                      strSubHeader.arg(UIHostNetworkManager::tr("IPv6 Network Mask Length"))
    118                                   .arg(m_interface.m_strInterfaceMaskLength6.isEmpty() ?
     118                                  .arg(m_interface.m_strMaskLength6.isEmpty() ?
    119119                                       UIHostNetworkManager::tr("Not set", "length") :
    120                                        m_interface.m_strInterfaceMaskLength6);
     120                                       m_interface.m_strMaskLength6);
    121121    }
    122122
    123123    /* DHCP server information: */
    124124    strToolTip += strHeader.arg(UIHostNetworkManager::tr("DHCP Server"))
    125                            .arg(m_dhcpserver.m_fDhcpServerEnabled ?
     125                           .arg(m_dhcpserver.m_fEnabled ?
    126126                                UIHostNetworkManager::tr("Enabled", "server") :
    127127                                UIHostNetworkManager::tr("Disabled", "server"));
    128     if (m_dhcpserver.m_fDhcpServerEnabled)
     128    if (m_dhcpserver.m_fEnabled)
    129129    {
    130130        strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("Address"))
    131                                   .arg(m_dhcpserver.m_strDhcpServerAddress.isEmpty() ?
     131                                  .arg(m_dhcpserver.m_strAddress.isEmpty() ?
    132132                                       UIHostNetworkManager::tr("Not set", "address") :
    133                                        m_dhcpserver.m_strDhcpServerAddress) +
     133                                       m_dhcpserver.m_strAddress) +
    134134                      strSubHeader.arg(UIHostNetworkManager::tr("Network Mask"))
    135                                   .arg(m_dhcpserver.m_strDhcpServerMask.isEmpty() ?
     135                                  .arg(m_dhcpserver.m_strMask.isEmpty() ?
    136136                                       UIHostNetworkManager::tr("Not set", "mask") :
    137                                        m_dhcpserver.m_strDhcpServerMask) +
     137                                       m_dhcpserver.m_strMask) +
    138138                      strSubHeader.arg(UIHostNetworkManager::tr("Lower Bound"))
    139                                   .arg(m_dhcpserver.m_strDhcpLowerAddress.isEmpty() ?
     139                                  .arg(m_dhcpserver.m_strLowerAddress.isEmpty() ?
    140140                                       UIHostNetworkManager::tr("Not set", "bound") :
    141                                        m_dhcpserver.m_strDhcpLowerAddress) +
     141                                       m_dhcpserver.m_strLowerAddress) +
    142142                      strSubHeader.arg(UIHostNetworkManager::tr("Upper Bound"))
    143                                   .arg(m_dhcpserver.m_strDhcpUpperAddress.isEmpty() ?
     143                                  .arg(m_dhcpserver.m_strUpperAddress.isEmpty() ?
    144144                                       UIHostNetworkManager::tr("Not set", "bound") :
    145                                        m_dhcpserver.m_strDhcpUpperAddress);
     145                                       m_dhcpserver.m_strUpperAddress);
    146146    }
    147147
    … …  
    378378        /* Save IPv4 interface configuration: */
    379379        if (   comInterface.isOk()
    380             && (   newData.m_interface.m_strInterfaceAddress != oldData.m_interface.m_strInterfaceAddress
    381                 || newData.m_interface.m_strInterfaceMask != oldData.m_interface.m_strInterfaceMask))
    382             comInterface.EnableStaticIPConfig(newData.m_interface.m_strInterfaceAddress, newData.m_interface.m_strInterfaceMask);
     380            && (   newData.m_interface.m_strAddress != oldData.m_interface.m_strAddress
     381                || newData.m_interface.m_strMask != oldData.m_interface.m_strMask))
     382            comInterface.EnableStaticIPConfig(newData.m_interface.m_strAddress, newData.m_interface.m_strMask);
    383383        /* Save IPv6 interface configuration: */
    384384        if (   comInterface.isOk()
    385             && newData.m_interface.m_fIpv6Supported
    386             && (   newData.m_interface.m_strInterfaceAddress6 != oldData.m_interface.m_strInterfaceAddress6
    387                 || newData.m_interface.m_strInterfaceMaskLength6 != oldData.m_interface.m_strInterfaceMaskLength6))
    388             comInterface.EnableStaticIPConfigV6(newData.m_interface.m_strInterfaceAddress6, newData.m_interface.m_strInterfaceMaskLength6.toULong());
     385            && newData.m_interface.m_fSupportedIPv6
     386            && (   newData.m_interface.m_strAddress6 != oldData.m_interface.m_strAddress6
     387                || newData.m_interface.m_strMaskLength6 != oldData.m_interface.m_strMaskLength6))
     388            comInterface.EnableStaticIPConfigV6(newData.m_interface.m_strAddress6, newData.m_interface.m_strMaskLength6.toULong());
    389389
    390390        /* Show error message if necessary: */
    … …  
    416416                    /* Save whether DHCP server is enabled: */
    417417                    if (   comServer.isOk()
    418                         && newData.m_dhcpserver.m_fDhcpServerEnabled != oldData.m_dhcpserver.m_fDhcpServerEnabled)
    419                         comServer.SetEnabled(newData.m_dhcpserver.m_fDhcpServerEnabled);
     418                        && newData.m_dhcpserver.m_fEnabled != oldData.m_dhcpserver.m_fEnabled)
     419                        comServer.SetEnabled(newData.m_dhcpserver.m_fEnabled);
    420420                    /* Save DHCP server configuration: */
    421421                    if (   comServer.isOk()
    422                         && newData.m_dhcpserver.m_fDhcpServerEnabled
    423                         && (   newData.m_dhcpserver.m_strDhcpServerAddress != oldData.m_dhcpserver.m_strDhcpServerAddress
    424                             || newData.m_dhcpserver.m_strDhcpServerMask != oldData.m_dhcpserver.m_strDhcpServerMask
    425                             || newData.m_dhcpserver.m_strDhcpLowerAddress != oldData.m_dhcpserver.m_strDhcpLowerAddress
    426                             || newData.m_dhcpserver.m_strDhcpUpperAddress != oldData.m_dhcpserver.m_strDhcpUpperAddress))
    427                         comServer.SetConfiguration(newData.m_dhcpserver.m_strDhcpServerAddress, newData.m_dhcpserver.m_strDhcpServerMask,
    428                                                    newData.m_dhcpserver.m_strDhcpLowerAddress, newData.m_dhcpserver.m_strDhcpUpperAddress);
     422                        && newData.m_dhcpserver.m_fEnabled
     423                        && (   newData.m_dhcpserver.m_strAddress != oldData.m_dhcpserver.m_strAddress
     424                            || newData.m_dhcpserver.m_strMask != oldData.m_dhcpserver.m_strMask
     425                            || newData.m_dhcpserver.m_strLowerAddress != oldData.m_dhcpserver.m_strLowerAddress
     426                            || newData.m_dhcpserver.m_strUpperAddress != oldData.m_dhcpserver.m_strUpperAddress))
     427                        comServer.SetConfiguration(newData.m_dhcpserver.m_strAddress, newData.m_dhcpserver.m_strMask,
     428                                                   newData.m_dhcpserver.m_strLowerAddress, newData.m_dhcpserver.m_strUpperAddress);
    429429
    430430                    /* Show error message if necessary: */
    … …  
    559559
    560560    /* Make sure dhcp server status changed: */
    561     if (   (   data.m_dhcpserver.m_fDhcpServerEnabled
     561    if (   (   data.m_dhcpserver.m_fEnabled
    562562            && pChangedItem->checkState(Column_DHCP) == Qt::Checked)
    563         || (   !data.m_dhcpserver.m_fDhcpServerEnabled
     563        || (   !data.m_dhcpserver.m_fEnabled
    564564            && pChangedItem->checkState(Column_DHCP) == Qt::Unchecked))
    565565        return;
    … …  
    580580        /* Save whether DHCP server is enabled: */
    581581        if (comServer.isOk())
    582             comServer.SetEnabled(!data.m_dhcpserver.m_fDhcpServerEnabled);
     582            comServer.SetEnabled(!data.m_dhcpserver.m_fEnabled);
    583583
    584584        /* Show error message if necessary: */
    … …  
    587587        {
    588588            /* Manually toggle the DHCP server status: */
    589             data.m_dhcpserver.m_fDhcpServerEnabled = !data.m_dhcpserver.m_fDhcpServerEnabled;
     589            data.m_dhcpserver.m_fEnabled = !data.m_dhcpserver.m_fEnabled;
    590590
    591591            /* Update interface in the tree: */
    … …  
    884884        data.m_interface.m_strName = comInterface.GetName();
    885885    if (comInterface.isOk())
    886         data.m_interface.m_strInterfaceAddress = comInterface.GetIPAddress();
     886        data.m_interface.m_strAddress = comInterface.GetIPAddress();
    887887    if (comInterface.isOk())
    888         data.m_interface.m_strInterfaceMask = comInterface.GetNetworkMask();
     888        data.m_interface.m_strMask = comInterface.GetNetworkMask();
    889889    if (comInterface.isOk())
    890         data.m_interface.m_fIpv6Supported = comInterface.GetIPV6Supported();
     890        data.m_interface.m_fSupportedIPv6 = comInterface.GetIPV6Supported();
    891891    if (comInterface.isOk())
    892         data.m_interface.m_strInterfaceAddress6 = comInterface.GetIPV6Address();
     892        data.m_interface.m_strAddress6 = comInterface.GetIPV6Address();
    893893    if (comInterface.isOk())
    894         data.m_interface.m_strInterfaceMaskLength6 = QString::number(comInterface.GetIPV6NetworkMaskPrefixLength());
     894        data.m_interface.m_strMaskLength6 = QString::number(comInterface.GetIPV6NetworkMaskPrefixLength());
    895895
    896896    /* Get host interface network name for further activities: */
    … …  
    918918        /* Gather DHCP server settings: */
    919919        if (comServer.isOk())
    920             data.m_dhcpserver.m_fDhcpServerEnabled = comServer.GetEnabled();
     920            data.m_dhcpserver.m_fEnabled = comServer.GetEnabled();
    921921        if (comServer.isOk())
    922             data.m_dhcpserver.m_strDhcpServerAddress = comServer.GetIPAddress();
     922            data.m_dhcpserver.m_strAddress = comServer.GetIPAddress();
    923923        if (comServer.isOk())
    924             data.m_dhcpserver.m_strDhcpServerMask = comServer.GetNetworkMask();
     924            data.m_dhcpserver.m_strMask = comServer.GetNetworkMask();
    925925        if (comServer.isOk())
    926             data.m_dhcpserver.m_strDhcpLowerAddress = comServer.GetLowerIP();
     926            data.m_dhcpserver.m_strLowerAddress = comServer.GetLowerIP();
    927927        if (comServer.isOk())
    928             data.m_dhcpserver.m_strDhcpUpperAddress = comServer.GetUpperIP();
     928            data.m_dhcpserver.m_strUpperAddress = comServer.GetUpperIP();
    929929
    930930        /* Show error message if necessary: */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette