Refactor and remove dead code, add property caching.

This helps with a flood of dbus messages due to properties.

Change-Id: I7aa9d36a077d84a88dab561d007d597b0780e096
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

1 files changed, 17 insertions, 7 deletions

diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h
index 49a1a91d29..4a4e91659b 100644
--- a/src/plugins/bearer/connman/qconnmanengine.h
+++ b/src/plugins/bearer/connman/qconnmanengine.h
@@ -56,6 +56,7 @@
 #include "../qbearerengine_impl.h"
 
 #include "qconnmanservice_linux_p.h"
+#include "qofonoservice_linux_p.h"
 
 #include <QMap>
 #include <QVariant>
@@ -91,28 +92,32 @@ public:
     virtual quint64 bytesReceived(const QString &id);
     virtual quint64 startTime(const QString &id);
 
-
     virtual QNetworkConfigurationManager::Capabilities capabilities() const;
     virtual QNetworkConfigurationPrivatePointer defaultConfiguration();
 
-    void configurationChange(const QString &id);
     QList<QNetworkConfigurationPrivate *> getConfigurations();
 
-
 private Q_SLOTS:
 
     void doRequestUpdate();
-    void servicePropertyChangedContext(const QString &,const QString &,const QDBusVariant &);
-    void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
-    void technologyPropertyChangedContext(const QString &,const QString &, const QDBusVariant &);
     void updateServices(const ConnmanMapList &changed, const QList<QDBusObjectPath> &removed);
 
+    void servicesReady(const QStringList &);
+    void finishedScan();
+    void changedModem();
+    void serviceStateChanged(const QString &state);
+    void configurationChange(QConnmanServiceInterface * service);
+    void reEvaluateCellular();
+    void inotifyActivated();
 private:
     QConnmanManagerInterface *connmanManager;
 
+    QOfonoManagerInterface *ofonoManager;
+    QOfonoNetworkRegistrationInterface *ofonoNetwork;
+    QOfonoDataConnectionManagerInterface *ofonoContextManager;
+
     QList<QNetworkConfigurationPrivate *> foundConfigurations;
 
-    QString serviceFromId(const QString &id);
     QString networkFromId(const QString &id);
 
     QNetworkConfiguration::StateFlags getStateForService(const QString &service);
@@ -130,6 +135,11 @@ private:
     QNetworkConfiguration::BearerType ofonoTechToBearerType(const QString &type);
     bool isRoamingAllowed(const QString &context);
     bool isAlwaysAskRoaming();
+    QMap <QString,QConnmanServiceInterface *> connmanServiceInterfaces;
+
+    int inotifyWatcher;
+    int inotifyFileDescriptor;
+
 protected:
     bool requiresPolling() const;
 };