--- a/qtmobility/src/systeminfo/qsysteminfo_mac_p.h Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_mac_p.h Mon May 03 13:18:40 2010 +0300
@@ -110,6 +110,9 @@
static QSystemInfoPrivate *self;
private Q_SLOTS:
+ protected:
+ void connectNotify(const char *signal);
+ void disconnectNotify(const char *signal);
};
@@ -139,8 +142,11 @@
QNetworkInterface interfaceForMode(QSystemNetworkInfo::NetworkMode mode);
static QSystemNetworkInfoPrivate *instance() {return self;}
- void networkChanged(const QString ¬ification, const QString interfaceName);
+ void wifiNetworkChanged(const QString ¬ification, const QString interfaceName);
QString getDefaultInterface();
+ QSystemNetworkInfo::NetworkMode currentMode();
+ void ethernetChanged();
+
Q_SIGNALS:
void networkStatusChanged(QSystemNetworkInfo::NetworkMode, QSystemNetworkInfo::NetworkStatus);
@@ -154,7 +160,6 @@
void primaryInterface();
private:
- bool isInterfaceActive(const char* netInterface);
QTimer *rssiTimer;
int signalStrengthCache;
static QSystemNetworkInfoPrivate *self;
@@ -164,6 +169,14 @@
private Q_SLOTS:
void rssiTimeout();
+protected:
+ void startNetworkChangeLoop();
+ bool isInterfaceActive(const char* netInterface);
+
+ void connectNotify(const char *signal);
+ void disconnectNotify(const char *signal);
+ bool hasWifi;
+
};
class QSystemDisplayInfoPrivate : public QObject