diff -r dbe86d96ce5b -r 2dc6da6fb431 wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsesockwrapper.h
--- a/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsesockwrapper.h	Thu May 27 13:59:00 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsesockwrapper.h	Fri Jun 11 14:43:07 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -12,74 +12,72 @@
 * Contributors:
 *
 * Description:
-* This is a header file for EsockWrapper class.
+* Wrapper for Symbian Esock library.
 */
 
-#ifndef ESOCKWRAPPER_H_
-#define ESOCKWRAPPER_H_
+#ifndef WLANQTUTILSESOCKWRAPPER_H
+#define WLANQTUTILSESOCKWRAPPER_H
+
+// System includes
 
 #include <QObject>
+#include <QScopedPointer>
 
-QT_BEGIN_HEADER
+// User includes
 
-QT_BEGIN_NAMESPACE
+// Forward declarations
+
+class WlanQtUtilsEsockWrapperPrivate;
 
-class EsockWrapperPrivate;
+// External data types
+
+// Constants
 
-/**
- * Wrapper for connection handling.
- */
-class EsockWrapper: public QObject
+// Class declaration
+
+class WlanQtUtilsEsockWrapper: public QObject
 {
     Q_OBJECT
     
 public:
     
-    /**
-     * Default constructor
-     */
-    EsockWrapper(QObject *parent = 0);
+    // Data types
+
+    WlanQtUtilsEsockWrapper(QObject *parent = 0);
+    
+    ~WlanQtUtilsEsockWrapper();
     
-    /**
-     * Destructor.
-     */
-    ~EsockWrapper();
-    
-public:
+    void updateConnection(bool isOpened, int platformStatusCode);
+
+    int lastStatusCode();
 
-    /**
-     * 
-     */
-    void updateConnection(bool isOpened);
+signals:
+
+    void connectionStatusFromWrapper(bool isOpened);
 
 public slots:
-    
-    /**
-     * Starts connection creation to given IAP.
-     * 
-     * @param[in] iapId IAP ID.
-     */
+
     void connectIap(int iapId);
+
+    void disconnectIap();
+
+protected:
+
+protected slots:
+
+private:
+
+private slots:
+
+private: // data
     
-    /**
-     * Disconnects connection.
-     */
-    void disconnectIap();
+    //! Private implementation
+    QScopedPointer<WlanQtUtilsEsockWrapperPrivate> d_ptr;
     
-signals:
+    //! Platform status code of latest connection creation attempt
+    int mLastStatusCode;
 
-    void connectionStatusFromWrapper(bool isOpened);   
-
-private: // Data
-    
-    /** Private esock wrapper. */
-    EsockWrapperPrivate *d_ptr;
+    // Friend classes
 };
 
-QT_END_HEADER
-
-QT_END_NAMESPACE
-
-#endif /*ESOCKWRAPPER_H_*/
-
-// End of file
+#endif // WLANQTUTILSESOCKWRAPPER_H