From a91a5c6f36da6b7324d0a52ecf1ab3c7517c5375 Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
Date: Mon, 6 Jul 2015 15:14:27 +0200
Subject: Wifi: Remove android specific code paths

eAndroid support has been deprecated.

Change-Id: Id62ce140917dc1e45e94e800dc8cdc54736dfc36
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
---
 src/wifi/qwificontroller_p.h | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'src/wifi/qwificontroller_p.h')

diff --git a/src/wifi/qwificontroller_p.h b/src/wifi/qwificontroller_p.h
index 185cff9..952b8d4 100644
--- a/src/wifi/qwificontroller_p.h
+++ b/src/wifi/qwificontroller_p.h
@@ -28,27 +28,12 @@
 #include <QtCore/QWaitCondition>
 #include <QtCore/QLoggingCategory>
 
-#ifdef Q_OS_ANDROID_NO_SDK
-#include <hardware_legacy/wifi.h>
-#include <cutils/properties.h>
-#else
 #include "qwifielinux_p.h"
-#endif
 
 QT_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(B2QT_WIFI)
 
-#ifdef Q_OS_ANDROID_NO_SDK
-int q_wifi_start_supplicant();
-int q_wifi_stop_supplicant();
-int q_wifi_connect_to_supplicant(const char *ifname);
-void q_wifi_close_supplicant_connection(const char *ifname);
-int q_wifi_wait_for_event(const char *ifname, char *buf, size_t len);
-int q_wifi_command(const char *ifname, const char *command, char *reply, size_t *reply_len);
-int wait_for_property(const char *name, const char *desired_value, int maxwait);
-#endif
-
 const QEvent::Type WIFI_SCAN_RESULTS = (QEvent::Type) (QEvent::User + 2001);
 const QEvent::Type WIFI_CONNECTED = (QEvent::Type) (QEvent::User + 2002);
 const QEvent::Type WIFI_HANDSHAKE_FAILED = (QEvent::Type) (QEvent::User + 2003);
@@ -58,9 +43,6 @@ const QEvent::Type WIFI_DISCONNECTED = (QEvent::Type) (QEvent::User + 2005);
 class QWifiManager;
 class QWifiManagerPrivate;
 class QWifiEventThread;
-#ifdef Q_OS_ANDROID_NO_SDK
-class QLocalSocket;
-#endif
 
 class QWifiEvent : public QEvent
 {
@@ -108,21 +90,13 @@ protected:
     void initializeBackend();
     void terminateBackend();
     void exitWifiEventThread();
-    void allocateOnThisThread();
-#ifdef Q_OS_ANDROID_NO_SDK
-    bool getQConnectivityReply();
-#else
     void killDhcpProcess(const QString &path) const;
-#endif
 
 private:
     QWifiManager *m_manager;
     QWifiManagerPrivate *const m_managerPrivate;
     bool m_exitEventThread;
     QByteArray m_interface;
-#ifdef Q_OS_ANDROID_NO_SDK
-    QLocalSocket *m_qcSocket;
-#endif
     QVector<Method> m_methods;
     QWifiEventThread *m_eventThread;
     QMutex m_methodsMutex;
-- 
cgit v1.2.3