--- a/wlanutilities/cpwlansettingsplugin/inc/wlansettings.h	Wed Aug 18 10:52:46 2010 +0300
+++ b/wlanutilities/cpwlansettingsplugin/inc/wlansettings.h	Thu Sep 02 21:36:44 2010 +0300
@@ -24,9 +24,10 @@
 
 // User includes
 
-#include "wlansettings_s60_p.h"
+// Forward declarations
 
-// Forward declarations
+class CWlanSettingsPrivate;
+class XQSettingsManager;
 
 // External data types
 
@@ -40,11 +41,17 @@
      
 public:
      
+     // Data types
+
      enum ScanNetworkType {
          EScanNetworkAuto = 0,
          EScanNetworkUserDefined        
      };
      
+     static const uint ScanNetworkAuto = 0xFFFFFFFF;
+     static const uint ScanNetworkMin = 1;
+     static const uint ScanNetworkMax = 30;
+     
      WlanSettings();
 
      ~WlanSettings();
@@ -61,27 +68,47 @@
      
      int setJoinWlanMode(int mode);
      
-     int isPowerSavingEnabled() const;
+     bool isWlanPowerSavingEnabled() const;
      
-     int isPsmEnabled() const;
+     bool isDevicePowerSavingEnabled();
      
      int setWlanPowerSaving(int powerSavingOption);
      
      int setWlanScanInterval(uint scanInterval);
 
+signals:
+
+    void devicePowerSavingUpdated();
+
+public slots:
+
+protected:
+
+protected slots:
+
 private:
-     
-     void readPsmKey();
-     
+
      Q_DISABLE_COPY(WlanSettings)
+
+     void readDevicePowerSavingKey();
+
+private slots:
+
+    void devicePowerSavingKeyChanged();
+    
+private: // data
+
+     //! Private Symbian specific implementation.
+     CWlanSettingsPrivate *d_ptr;
      
-private:    //data
+     //! Settings manager for platform settings reading & status changes.
+     XQSettingsManager *mSettingsManager;
      
-     CWlanSettingsPrivate *mImpl;
+     //! Device Power Saving Mode.
+     int mDevicePowerSavingMode;
      
-     int mPsmKeyValue;
-     
+     //! Is mDevicePowerSavingMode up to date, or do we need to read it again?
+     bool mDevicePowerSavingModeUpToDate;
 };
 
-
 #endif /* WLANSETTINGS_H_ */