diff options
author | Gatis Paeglis <gatis.paeglis@theqtcompany.com> | 2015-07-06 15:14:27 +0200 |
---|---|---|
committer | Gatis Paeglis <gatis.paeglis@digia.com> | 2015-07-06 14:19:57 +0000 |
commit | a91a5c6f36da6b7324d0a52ecf1ab3c7517c5375 (patch) | |
tree | c5a738df67a356ef1cce185f564d3c1a8f8e9ef4 /src/wifi/qwificontroller_p.h | |
parent | 602034c3a71c53d050e67101e070185cbcf7ccee (diff) |
Wifi: Remove android specific code paths
eAndroid support has been deprecated.
Change-Id: Id62ce140917dc1e45e94e800dc8cdc54736dfc36
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'src/wifi/qwificontroller_p.h')
-rw-r--r-- | src/wifi/qwificontroller_p.h | 26 |
1 files changed, 0 insertions, 26 deletions
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; |