Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Fix license header in qs60keycapture_p.h and qs60keycapture.cpp
  Fixing WINSCW compile error
  whitespace fixes
  Enable key capture and RemCon interfaces for Qt apps on Symbian

2 files changed, 37 insertions, 37 deletions

diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index 38ae0c8..fc2791a 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -258,7 +258,7 @@ void SymbianEngine::updateConfigurationsL()
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
     // S60 version is >= Series60 3rd Edition Feature Pack 2
     TInt error = KErrNone;
-    
+
     // Loop through all IAPs
     RArray<TUint32> connectionMethods; // IAPs
     CleanupClosePushL(connectionMethods);
@@ -292,7 +292,7 @@ void SymbianEngine::updateConfigurationsL()
         CleanupStack::PopAndDestroy(&connectionMethod);
     }
     CleanupStack::PopAndDestroy(&connectionMethods);
-    
+
     // Loop through all SNAPs
     RArray<TUint32> destinations;
     CleanupClosePushL(destinations);
@@ -462,7 +462,7 @@ void SymbianEngine::updateConfigurationsL()
                     break;
                 }
             }
-        }    
+        }
     }
 
     foreach (const QString &oldIface, knownSnapConfigs) {
@@ -492,13 +492,13 @@ SymbianNetworkConfigurationPrivate *SymbianEngine::configFromConnectionMethodL(
     SymbianNetworkConfigurationPrivate *cpPriv = new SymbianNetworkConfigurationPrivate;
     TUint32 iapId = connectionMethod.GetIntAttributeL(CMManager::ECmIapId);
     QString ident = QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX+QString::number(qHash(iapId));
-    
+
     HBufC *pName = connectionMethod.GetStringAttributeL(CMManager::ECmName);
     CleanupStack::PushL(pName);
     QT_TRYCATCH_LEAVING(cpPriv->name = QString::fromUtf16(pName->Ptr(),pName->Length()));
     CleanupStack::PopAndDestroy(pName);
     pName = NULL;
-    
+
     TUint32 bearerId = connectionMethod.GetIntAttributeL(CMManager::ECmCommsDBBearerType);
     switch (bearerId) {
     case KCommDbBearerCSD:
@@ -523,7 +523,7 @@ SymbianNetworkConfigurationPrivate *SymbianEngine::configFromConnectionMethodL(
         cpPriv->bearerType = QNetworkConfiguration::BearerUnknown;
         break;
     }
-    
+
     TInt error = KErrNone;
     TUint32 bearerType = connectionMethod.GetIntAttributeL(CMManager::ECmBearerType);
     switch (bearerType) {
@@ -547,13 +547,13 @@ SymbianNetworkConfigurationPrivate *SymbianEngine::configFromConnectionMethodL(
         CleanupStack::PopAndDestroy(pName);
         pName = NULL;
     }
- 
+
     cpPriv->state = QNetworkConfiguration::Defined;
     TBool isConnected = connectionMethod.GetBoolAttributeL(CMManager::ECmConnected);
     if (isConnected) {
         cpPriv->state = QNetworkConfiguration::Active;
     }
-    
+
     cpPriv->isValid = true;
     cpPriv->id = ident;
     cpPriv->numericId = iapId;
@@ -569,7 +569,7 @@ bool SymbianEngine::readNetworkConfigurationValuesFromCommsDb(
 {
     TRAPD(error, readNetworkConfigurationValuesFromCommsDbL(aApId,apNetworkConfiguration));
     if (error != KErrNone) {
-        return false;        
+        return false;
     }
     return true;
 }
@@ -577,22 +577,22 @@ bool SymbianEngine::readNetworkConfigurationValuesFromCommsDb(
 void SymbianEngine::readNetworkConfigurationValuesFromCommsDbL(
         TUint32 aApId, SymbianNetworkConfigurationPrivate *apNetworkConfiguration)
 {
-    CApDataHandler* pDataHandler = CApDataHandler::NewLC(*ipCommsDB); 
-    CApAccessPointItem* pAPItem = CApAccessPointItem::NewLC(); 
+    CApDataHandler* pDataHandler = CApDataHandler::NewLC(*ipCommsDB);
+    CApAccessPointItem* pAPItem = CApAccessPointItem::NewLC();
     TBuf<KCommsDbSvrMaxColumnNameLength> name;
-    
+
     CApUtils* pApUtils = CApUtils::NewLC(*ipCommsDB);
     TUint32 apId = pApUtils->WapIdFromIapIdL(aApId);
-    
+
     pDataHandler->AccessPointDataL(apId,*pAPItem);
     pAPItem->ReadTextL(EApIapName, name);
     if (name.Compare(_L("Easy WLAN")) == 0) {
         // "Easy WLAN" won't be accepted to the Configurations list
         User::Leave(KErrNotFound);
     }
-    
+
     QString ident = QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX+QString::number(qHash(aApId));
-    
+
     QT_TRYCATCH_LEAVING(apNetworkConfiguration->name = QString::fromUtf16(name.Ptr(),name.Length()));
     apNetworkConfiguration->isValid = true;
     apNetworkConfiguration->id = ident;
@@ -603,7 +603,7 @@ void SymbianEngine::readNetworkConfigurationValuesFromCommsDbL(
     apNetworkConfiguration->purpose = QNetworkConfiguration::UnknownPurpose;
     apNetworkConfiguration->roamingSupported = false;
     switch (pAPItem->BearerTypeL()) {
-    case EApBearerTypeCSD:      
+    case EApBearerTypeCSD:
         apNetworkConfiguration->bearerType = QNetworkConfiguration::Bearer2G;
         break;
     case EApBearerTypeGPRS:
@@ -628,7 +628,7 @@ void SymbianEngine::readNetworkConfigurationValuesFromCommsDbL(
         apNetworkConfiguration->bearerType = QNetworkConfiguration::BearerUnknown;
         break;
     }
-    
+
     CleanupStack::PopAndDestroy(pApUtils);
     CleanupStack::PopAndDestroy(pAPItem);
     CleanupStack::PopAndDestroy(pDataHandler);
@@ -667,7 +667,7 @@ QNetworkConfigurationPrivatePointer SymbianEngine::defaultConfigurationL()
         ptr = accessPointConfigurations.value(iface);
     }
 #endif
-    
+
     if (ptr) {
         QMutexLocker configLocker(&ptr->mutex);
         if (ptr->isValid)
@@ -687,7 +687,7 @@ void SymbianEngine::updateActiveAccessPoints()
     TUint connectionCount;
     iConnectionMonitor.GetConnectionCount(connectionCount, status);
     User::WaitForRequest(status);
-    
+
     // Go through all connections and set state of related IAPs to Active.
     // Status needs to be checked carefully, because ConnMon lists also e.g.
     // WLAN connections that are being currently tried --> we don't want to
@@ -766,7 +766,7 @@ void SymbianEngine::accessPointScanningReady(TBool scanSuccessful, TConnMonIapIn
     iUpdateGoingOn = false;
     if (scanSuccessful) {
         QList<QString> unavailableConfigs = accessPointConfigurations.keys();
-        
+
         // Set state of returned IAPs to Discovered
         // if state is not already Active
         for(TUint i=0; i<iapInfo.iCount; i++) {
@@ -783,7 +783,7 @@ void SymbianEngine::accessPointScanningReady(TBool scanSuccessful, TConnMonIapIn
                 }
             }
         }
-        
+
         // Make sure that state of rest of the IAPs won't be Active
         foreach (const QString &iface, unavailableConfigs) {
             QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(iface);
@@ -795,7 +795,7 @@ void SymbianEngine::accessPointScanningReady(TBool scanSuccessful, TConnMonIapIn
     }
 
     updateStatesToSnaps();
-    
+
     if (!iFirstUpdate) {
         startCommsDatabaseNotifications();
         mutex.unlock();
@@ -847,7 +847,7 @@ void SymbianEngine::updateStatesToSnaps()
         } else {
             changeConfigurationStateTo(ptr, QNetworkConfiguration::Defined);
         }
-    }    
+    }
 }
 
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
@@ -1065,7 +1065,7 @@ void SymbianEngine::EventL(const CConnMonEventBase& aEvent)
         if (connectionStatus == KConfigDaemonStartingRegistration) {
             TUint connectionId = realEvent->ConnectionId();
             TUint subConnectionCount = 0;
-            TUint apId;            
+            TUint apId;
             TRequestStatus status;
             iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
             User::WaitForRequest(status);
@@ -1091,7 +1091,7 @@ void SymbianEngine::EventL(const CConnMonEventBase& aEvent)
             // Connection has been successfully opened
             TUint connectionId = realEvent->ConnectionId();
             TUint subConnectionCount = 0;
-            TUint apId;            
+            TUint apId;
             TRequestStatus status;
             iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
             User::WaitForRequest(status);
@@ -1147,7 +1147,7 @@ void SymbianEngine::EventL(const CConnMonEventBase& aEvent)
                                                    connectionId, QNetworkSession::Disconnected);
                 );
             }
-            
+
             bool online = false;
             foreach (const QString &iface, accessPointConfigurations.keys()) {
                 QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(iface);
@@ -1163,7 +1163,7 @@ void SymbianEngine::EventL(const CConnMonEventBase& aEvent)
             }
         }
         }
-        break;    
+        break;
 
     case EConnMonIapAvailabilityChange:
         {
@@ -1177,7 +1177,7 @@ void SymbianEngine::EventL(const CConnMonEventBase& aEvent)
 
             QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident);
             if (ptr) {
-                // Configuration is either Discovered or Active 
+                // Configuration is either Discovered or Active
                 QT_TRYCATCH_LEAVING(changeConfigurationStateAtMinTo(ptr, QNetworkConfiguration::Discovered));
                 unDiscoveredConfigs.removeOne(ident);
             }
@@ -1363,7 +1363,7 @@ AccessPointsAvailabilityScanner::AccessPointsAvailabilityScanner(SymbianEngine&
                                                                RConnectionMonitor& connectionMonitor)
     : CActive(CActive::EPriorityHigh), iOwner(owner), iConnectionMonitor(connectionMonitor)
 {
-    CActiveScheduler::Add(this);  
+    CActiveScheduler::Add(this);
 }
 
 AccessPointsAvailabilityScanner::~AccessPointsAvailabilityScanner()
diff --git a/src/plugins/bearer/symbian/symbianengine.h b/src/plugins/bearer/symbian/symbianengine.h
index 7455d25..a205c97 100644
--- a/src/plugins/bearer/symbian/symbianengine.h
+++ b/src/plugins/bearer/symbian/symbianengine.h
@@ -145,10 +145,10 @@ public:
 
 Q_SIGNALS:
     void onlineStateChanged(bool isOnline);
-    
+
     void configurationStateChanged(quint32 accessPointId, quint32 connMonId,
                                    QNetworkSession::State newState);
-    
+
 public Q_SLOTS:
     void updateConfigurations();
     void delayedConfigurationUpdate();
@@ -169,8 +169,8 @@ private:
             TUint32 aApId, SymbianNetworkConfigurationPrivate *apNetworkConfiguration);
     void readNetworkConfigurationValuesFromCommsDbL(
             TUint32 aApId, SymbianNetworkConfigurationPrivate *apNetworkConfiguration);
-#endif    
-    
+#endif
+
     void updateConfigurationsL();
     void updateActiveAccessPoints();
     void updateAvailableAccessPoints();
@@ -190,7 +190,7 @@ protected:
     // From CActive
     void RunL();
     void DoCancel();
-    
+
 private:
     // MConnectionMonitorObserver
     void EventL(const CConnMonEventBase& aEvent);
@@ -200,7 +200,7 @@ private:
 #endif
 
 private: // Data
-    bool               iFirstUpdate; 
+    bool               iFirstUpdate;
     CCommsDatabase*    ipCommsDB;
     RConnectionMonitor iConnectionMonitor;
 
@@ -227,11 +227,11 @@ class AccessPointsAvailabilityScanner : public CActive
 {
 public:
     AccessPointsAvailabilityScanner(SymbianEngine& owner,
-                                   RConnectionMonitor& connectionMonitor); 
+                                   RConnectionMonitor& connectionMonitor);
     ~AccessPointsAvailabilityScanner();
 
     void StartScanning();
-    
+
 protected: // From CActive
     void RunL();
     void DoCancel();