Remove all device utilities except network settings

Also remove USB ethernet functionality from Qt Network Settings.

Task-number: QTBUG-88315
Change-Id: I06c41b61854b57f57c264b3c98940333902222d2
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>

4 files changed, 0 insertions, 136 deletions

diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
index a56edca..fe62bbe 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -39,8 +39,6 @@
 QT_BEGIN_NAMESPACE
 
 const QString ConnManServiceName(QStringLiteral("net.connman"));
-const QString QdbdFileName(QStringLiteral("/etc/default/qdbd"));
-const char* SearchKeyword("USB_ETHERNET_PROTOCOL=");
 
 QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent)
     :QObject(parent)
@@ -324,86 +322,4 @@ void QNetworkSettingsManagerPrivate::serviceReady()
     }
 }
 
-QString QNetworkSettingsManagerPrivate::usbEthernetInternetProtocolAddress()
-{
-    QString usbEthernetIp = QLatin1String("Not connected");
-    QNetworkInterface interface = QNetworkInterface::interfaceFromName(QLatin1String("usb0"));
-    if (interface.flags().testFlag(QNetworkInterface::IsUp)) {
-        for (QNetworkAddressEntry &entry:interface.addressEntries()) {
-            if (entry.ip().protocol() == QAbstractSocket::IPv4Protocol){
-                usbEthernetIp = entry.ip().toString();
-                break;
-            }
-        }
-    }
-    return usbEthernetIp;
-}
-
-QString QNetworkSettingsManagerPrivate::usbVirtualEthernetLinkProtocol()
-{
-    QByteArray line(QNetworkSettingsManagerPrivate::readUsbEthernetProtocolLine());
-    QString protocol;
-    if (line.size()) {
-        int keywordStartIndex(line.indexOf("="));
-        line = line.trimmed();
-        protocol = QString::fromLatin1( line.mid(keywordStartIndex + 1, (line.length() - 1)).toUpper() );
-    }
-    return protocol;
-}
-
-bool QNetworkSettingsManagerPrivate::hasUsbEthernetProtocolConfiguration()
-{
-    return !(QNetworkSettingsManagerPrivate::readUsbEthernetProtocolLine().isEmpty());
-}
-
-void QNetworkSettingsManagerPrivate::setUsbVirtualEthernetLinkProtocol(const QString &protocol)
-{
-    if (QLatin1String("RNDIS") == protocol || QLatin1String("CDCECM") == protocol) {
-        QByteArray fileContent(QNetworkSettingsManagerPrivate::readQdbdFileContent());
-        writeUsbEthernetProtocolToFileContent(fileContent, protocol);
-    } else{
-        qWarning("Unsupported USB Ethernet protocol");
-    }
-}
-
-QByteArray QNetworkSettingsManagerPrivate::readQdbdFileContent()
-{
-    QFile qdbdFile(QdbdFileName);
-    QByteArray fileContent;
-    if (qdbdFile.open(QIODevice::ReadOnly | QIODevice::Text))
-        fileContent = qdbdFile.readAll();
-
-    return fileContent;
-}
-
-QByteArray QNetworkSettingsManagerPrivate::readUsbEthernetProtocolLine()
-{
-    QByteArray fileContent(QNetworkSettingsManagerPrivate::readQdbdFileContent());
-    int keywordStartIndex(fileContent.indexOf(SearchKeyword, 0));
-    int keywordLineEndIndex(fileContent.indexOf("\n", keywordStartIndex));
-    QByteArray keywordLine = fileContent.mid(keywordStartIndex, keywordLineEndIndex);
-    return keywordLine;
-}
-
-void QNetworkSettingsManagerPrivate::writeUsbEthernetProtocolToFileContent(QByteArray &fileContent, const QString &protocol)
-{
-    int keywordStartIndex(fileContent.indexOf(SearchKeyword));
-    QByteArray previousLines = fileContent.mid(0, keywordStartIndex);
-    int keywordLineEndIndex(fileContent.indexOf("\n", keywordStartIndex));
-    QByteArray keywordLine = fileContent.mid(keywordStartIndex, keywordLineEndIndex);
-    QByteArray followingLines = fileContent.mid((keywordLineEndIndex), (fileContent.length() - 1));
-    QByteArray updatedLines = previousLines.append(SearchKeyword);
-    updatedLines.append(protocol.toLatin1().toLower());
-    updatedLines.append(followingLines);
-    QFile qdbdFile(QdbdFileName);
-    if (qdbdFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        int result = qdbdFile.write(updatedLines);
-        if (-1 == result)
-            qDebug("USB Ethernet protocol write to file failed");
-
-    } else {
-        qDebug("USB Ethernet protocol file open failed");
-    }
-}
-
 QT_END_NAMESPACE
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h
index c6f31e6..c199621 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.h
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.h
@@ -74,10 +74,6 @@ public:
     QNetworkSettingsService* currentWifiConnection() const {return m_currentWifiConnection;}
     void setCurrentWiredConnection(QNetworkSettingsService *connection) {m_currentWiredConnection = connection;}
     QNetworkSettingsService* currentWiredConnection() const {return m_currentWiredConnection;}
-    QString usbEthernetInternetProtocolAddress();
-    QString usbVirtualEthernetLinkProtocol();
-    bool hasUsbEthernetProtocolConfiguration();
-    void setUsbVirtualEthernetLinkProtocol(const QString &protocol);
 
 public slots:
     void getServicesFinished(QDBusPendingCallWatcher *watcher);
@@ -92,9 +88,6 @@ public slots:
 private:
     bool initialize();
     void handleNewService(const QString &servicePath);
-    void writeUsbEthernetProtocolToFileContent(QByteArray &fileContent, const QString &protocol);
-    static QByteArray readQdbdFileContent();
-    static QByteArray readUsbEthernetProtocolLine();
 
 protected:
     QNetworkSettingsInterfaceModel m_interfaceModel;
diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp
index a128049..667004f 100644
--- a/src/networksettings/qnetworksettingsmanager.cpp
+++ b/src/networksettings/qnetworksettingsmanager.cpp
@@ -330,41 +330,4 @@ QNetworkSettingsUserAgent* QNetworkSettingsManager::userAgent()
     return d->userAgent();
 }
 
-/*!
-    Returns the ip address of usb ethernet network.
-*/
-QString QNetworkSettingsManager::usbEthernetInternetProtocolAddress()
-{
-    Q_D(QNetworkSettingsManager);
-    return d->usbEthernetInternetProtocolAddress();
-}
-
-/*!
-    Returns the usb ethernet protocol
-*/
-QString QNetworkSettingsManager::usbVirtualEthernetLinkProtocol()
-{
-    Q_D(QNetworkSettingsManager);
-    return d->usbVirtualEthernetLinkProtocol();
-}
-
-
-/*!
-    Returns true if usb ethernet protocol is configured by file and configuration file exists.
-*/
-bool QNetworkSettingsManager::hasUsbEthernetProtocolConfiguration()
-{
-    Q_D(QNetworkSettingsManager);
-    return d->hasUsbEthernetProtocolConfiguration();
-}
-
-/*!
-    Set the usb ethernet protocol according to parameter.
-*/
-void QNetworkSettingsManager::setUsbVirtualEthernetLinkProtocol(const QString &protocol)
-{
-    Q_D(QNetworkSettingsManager);
-    d->setUsbVirtualEthernetLinkProtocol(protocol);
-}
-
 QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h
index 16ed539..4d20179 100644
--- a/src/networksettings/qnetworksettingsmanager.h
+++ b/src/networksettings/qnetworksettingsmanager.h
@@ -52,8 +52,6 @@ class Q_DECL_EXPORT QNetworkSettingsManager : public QObject
     Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ userAgent CONSTANT)
     Q_PROPERTY(QNetworkSettingsService* currentWifiConnection READ currentWifiConnection NOTIFY currentWifiConnectionChanged)
     Q_PROPERTY(QNetworkSettingsService* currentWiredConnection READ currentWiredConnection NOTIFY currentWiredConnectionChanged)
-    Q_PROPERTY(QString usbEthernetIpAddress READ usbEthernetInternetProtocolAddress NOTIFY usbEthernetInternetProtocolAddressChanged)
-    Q_PROPERTY(QString usbEthernetProtocol READ usbVirtualEthernetLinkProtocol NOTIFY usbVirtualEthernetLinkProtocolChanged)
 
 public:
     explicit QNetworkSettingsManager(QObject* parent = Q_NULLPTR);
@@ -71,18 +69,12 @@ public:
     QNetworkSettingsService* currentWifiConnection();
     QNetworkSettingsService* currentWiredConnection();
     Q_INVOKABLE QNetworkSettingsInterface* interface(int type, int instance);
-    Q_INVOKABLE QString usbEthernetInternetProtocolAddress();
-    Q_INVOKABLE QString usbVirtualEthernetLinkProtocol();
-    Q_INVOKABLE bool hasUsbEthernetProtocolConfiguration();
-    Q_INVOKABLE void setUsbVirtualEthernetLinkProtocol(const QString &protocol);
 
 Q_SIGNALS:
     void servicesChanged();
     void interfacesChanged();
     void currentWifiConnectionChanged();
     void currentWiredConnectionChanged();
-    void usbEthernetInternetProtocolAddressChanged(const QString &newusbEthernetIpAddress);
-    void usbVirtualEthernetLinkProtocolChanged(const QString &newUsbEthernetProtocol);
 
 protected:
     QNetworkSettingsManagerPrivate *d_ptr;