1 files changed, 3 insertions, 75 deletions

diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
index 6e6b702..d0ef6dc 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h
+++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -70,8 +70,8 @@
 
 #ifndef __CONNMAN_DBUS_H
 
-#define	CONNMAN_SERVICE     "org.moblin.connman"
-#define	CONNMAN_PATH        "/org/moblin/connman"
+#define	CONNMAN_SERVICE     "net.connman"
+#define	CONNMAN_PATH        "/net/connman"
 
 #define CONNMAN_DEBUG_INTERFACE		CONNMAN_SERVICE ".Debug"
 #define CONNMAN_ERROR_INTERFACE		CONNMAN_SERVICE ".Error"
@@ -84,8 +84,6 @@
 #define CONNMAN_TASK_INTERFACE		CONNMAN_SERVICE ".Task"
 #define CONNMAN_PROFILE_INTERFACE	CONNMAN_SERVICE ".Profile"
 #define CONNMAN_SERVICE_INTERFACE	CONNMAN_SERVICE ".Service"
-#define CONNMAN_DEVICE_INTERFACE	CONNMAN_SERVICE ".Device"
-#define CONNMAN_NETWORK_INTERFACE	CONNMAN_SERVICE ".Network"
 #define CONNMAN_PROVIDER_INTERFACE	CONNMAN_SERVICE ".Provider"
 #define CONNMAN_TECHNOLOGY_INTERFACE	CONNMAN_SERVICE ".Technology"
 #endif
@@ -151,38 +149,6 @@ protected:
     QVariant getProperty(const QString &);
 };
 
-
-class QConnmanNetworkInterface : public QDBusAbstractInterface
-{
-    Q_OBJECT
-
-public:
-
-    QConnmanNetworkInterface(const QString &dbusPathName, QObject *parent = 0);
-    ~QConnmanNetworkInterface();
-
-    QVariantMap getProperties();
-
-    //properties
-    QString getAddress();
-    QString getName();
-    bool isConnected();
-    quint8 getSignalStrength();
-    QString getDevice();
-    QString getWifiSsid();
-    QString getWifiMode();
-    QString getWifiSecurity();
-    QString getWifiPassphrase();
-
-Q_SIGNALS:
-    void propertyChanged(const QString &, const QDBusVariant &value);
-    void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
-protected:
-    void connectNotify(const char *signal);
-    void disconnectNotify(const char *signal);
-    QVariant getProperty(const QString &);
-};
-
 class QConnmanProfileInterfacePrivate;
 class QConnmanProfileInterface : public QDBusAbstractInterface
 {
@@ -287,8 +253,6 @@ public:
     QString getName();
     QString getType();
 
-    QStringList getDevices();
-
 Q_SIGNALS:
     void propertyChanged(const QString &, const QDBusVariant &value);
     void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
@@ -337,42 +301,6 @@ private:
     QConnmanCounterInterfacePrivate *d;
 };
 
-class QConnmanDeviceInterface : public QDBusAbstractInterface
-{
-    Q_OBJECT
-
-public:
-
-    QConnmanDeviceInterface(const QString &dbusPathName,QObject *parent = 0);
-    ~QConnmanDeviceInterface();
-
-    QVariantMap getProperties();
-    void scan();
-
-//properties
-    QString getAddress();
-    QString getName();
-    QString getType();
-    QString getInterface();
-    bool isPowered();
-    quint16 getScanInterval();
-    bool setScanInterval(const QString &interval);
-
-    bool isScanning();
-    QStringList getNetworks();
-    bool setEnabled(bool powered);
-    bool setProperty(const QString &name, const QDBusVariant &value);
-
-Q_SIGNALS:
-    void propertyChanged(const QString &, const QDBusVariant &value);
-    void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
-protected:
-    void connectNotify(const char *signal);
-    void disconnectNotify(const char *signal);
-    QVariant getProperty(const QString &);
-
-};
-
 class QConnmanDBusHelper: public QObject, protected QDBusContext
  {
      Q_OBJECT