1 files changed, 18 insertions, 7 deletions

diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h
index 8b5d1a7..16cb899 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.h
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.h
@@ -43,6 +43,7 @@
 #include <QObject>
 #include <QtDBus>
 #include <QMap>
+#include <QPointer>
 #include "connmancommon.h"
 #include "qnetworksettingsmanager.h"
 #include "qnetworksettingsinterfacemodel.h"
@@ -70,10 +71,14 @@ public:
     void connectBySsid(const QString &name);
     void clearConnectionState();
     void tryNextConnection();
-    void setCurrentWifiConnection(QNetworkSettingsService *connection) {m_currentWifiConnection = connection;}
-    QNetworkSettingsService* currentWifiConnection() const {return m_currentWifiConnection;}
-    void setCurrentWiredConnection(QNetworkSettingsService *connection) {m_currentWiredConnection = connection;}
-    QNetworkSettingsService* currentWiredConnection() const {return m_currentWiredConnection;}
+    void setCurrentWifiConnection(QNetworkSettingsService *connection);
+    QNetworkSettingsService* currentWifiConnection() const;
+    void setCurrentWiredConnection(QNetworkSettingsService *connection);
+    QNetworkSettingsService* currentWiredConnection() const;
+    QString usbEthernetInternetProtocolAddress();
+    QString usbVirtualEthernetLinkProtocol();
+    bool hasUsbEthernetProtocolConfiguration();
+    void setUsbVirtualEthernetLinkProtocol(const QString &protocol);
 
 public slots:
     void getServicesFinished(QDBusPendingCallWatcher *watcher);
@@ -84,12 +89,18 @@ public slots:
     void onConnmanServiceRegistered(const QString &serviceName);
     void onTechnologyAdded(const QDBusObjectPath &technology, const QVariantMap &properties);
     void onTechnologyRemoved(const QDBusObjectPath &technology);
+
 private:
     bool initialize();
-    void handleNewService(const QString& servicePath);
+    void handleNewService(const QString &servicePath);
+    void writeUsbEthernetProtocolToFileContent(QByteArray &fileContent, const QString &protocol);
+    static QByteArray readQdbdFileContent();
+    static QByteArray readUsbEthernetProtocolLine();
+
 protected:
     QNetworkSettingsInterfaceModel m_interfaceModel;
     QNetworkSettingsServiceModel *m_serviceModel;
+    QMap<QString, QNetworkSettingsService*> m_unknownServices;
     QMap<QString, QNetworkSettingsService*> m_unnamedServices;
     QMap<QString, QNetworkSettingsService*> m_unnamedServicesForSsidConnection;
     QNetworkSettingsServiceFilter *m_serviceFilter;
@@ -98,8 +109,8 @@ private:
     QNetworkSettingsUserAgent *m_agent;
     QDBusServiceWatcher *m_serviceWatcher;
     QString m_currentSsid;
-    QNetworkSettingsService *m_currentWifiConnection;
-    QNetworkSettingsService *m_currentWiredConnection;
+    QPointer<QNetworkSettingsService> m_currentWifiConnection;
+    QPointer<QNetworkSettingsService> m_currentWiredConnection;
     bool m_initialized;
 };