connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ConnectionUiUtilities.cpp
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ConnectionUiUtilities.cpp Tue Aug 31 15:35:44 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ConnectionUiUtilities.cpp Wed Sep 01 12:23:51 2010 +0100
@@ -278,10 +278,10 @@
// ---------------------------------------------------------
//
EXPORT_C void CConnectionUiUtilities::ConnectedViaDestAndConnMethodNote(
- const TUint32 /*aDestId*/,
- const TUint32 /*aConnMId*/ )
+ const TUint32 aDestId,
+ const TUint32 aConnMId )
{
- // Deprecated.
+ iImpl->ConnectedViaDestAndConnMethodNote( aDestId, aConnMId );
}
// ---------------------------------------------------------
@@ -289,11 +289,11 @@
// ---------------------------------------------------------
//
EXPORT_C void CConnectionUiUtilities::ConnectedViaDestAndConnMethodNote(
- const TUint32 /*aDestId*/,
- const TUint32 /*aConnMId*/,
- TRequestStatus& /*aStatus*/ )
+ const TUint32 aDestId,
+ const TUint32 aConnMId,
+ TRequestStatus& aStatus )
{
- // Deprecated.
+ iImpl->ConnectedViaDestAndConnMethodNote( aDestId, aConnMId, aStatus );
}
// ---------------------------------------------------------
@@ -302,7 +302,7 @@
//
EXPORT_C void CConnectionUiUtilities::CancelConnectedViaDestAndConnMethodNote()
{
- // Deprecated.
+ iImpl->CancelConnectedViaDestAndConnMethodNote();
}
// ---------------------------------------------------------
@@ -354,19 +354,19 @@
// ---------------------------------------------------------
//
EXPORT_C void CConnectionUiUtilities::ChangingConnectionToNote(
- const TUint32 /*aConnMId*/ )
+ const TUint32 aConnMId )
{
- // Deprecated.
+ iImpl->ChangingConnectionToNote( aConnMId );
}
// ---------------------------------------------------------
// CConnectionUiUtilities::ChangingConnectionToNote
// ---------------------------------------------------------
//
-EXPORT_C void CConnectionUiUtilities::ChangingConnectionToNote( const TUint32 /*aConnMId*/,
- TRequestStatus& /*aStatus*/ )
+EXPORT_C void CConnectionUiUtilities::ChangingConnectionToNote( const TUint32 aConnMId,
+ TRequestStatus& aStatus )
{
- // Deprecated.
+ iImpl->ChangingConnectionToNote( aConnMId, aStatus );
}
// ---------------------------------------------------------
@@ -375,7 +375,7 @@
//
EXPORT_C void CConnectionUiUtilities::CancelChangingConnectionToNote()
{
- // Deprecated.
+ iImpl->CancelChangingConnectionToNote();
}
// ---------------------------------------------------------
@@ -408,9 +408,9 @@
// ---------------------------------------------------------
//
EXPORT_C void CConnectionUiUtilities::ConnectedViaConnMethodNote(
- const TUint32 /*aConnMId*/ )
+ const TUint32 aConnMId )
{
- // Deprecated.
+ iImpl->ConnectedViaConnMethodNote( aConnMId );
}
// ---------------------------------------------------------
@@ -418,10 +418,10 @@
// ---------------------------------------------------------
//
EXPORT_C void CConnectionUiUtilities::ConnectedViaConnMethodNote(
- const TUint32 /*aConnMId*/,
- TRequestStatus& /*aStatus*/ )
+ const TUint32 aConnMId,
+ TRequestStatus& aStatus )
{
- // Deprecated.
+ iImpl->ConnectedViaConnMethodNote( aConnMId , aStatus );
}
// ---------------------------------------------------------
@@ -430,7 +430,7 @@
//
EXPORT_C void CConnectionUiUtilities::CancelConnectedViaConnMethodNote()
{
- // Deprecated.
+ iImpl->CancelConnectedViaConnMethodNote();
}
@@ -490,26 +490,6 @@
}
// ---------------------------------------------------------
-// CConnectionUiUtilities::WlanPowerSaveTestNote
-// ---------------------------------------------------------
-//
-EXPORT_C void CConnectionUiUtilities::WlanPowerSaveTestNote(
- TBool& aDisable,
- TRequestStatus& aStatus )
- {
- iImpl->WlanPowerSaveTestNote( aDisable, aStatus );
- }
-
-// ---------------------------------------------------------
-// CConnectionUiUtilities::CancelWlanPowerSaveTestNote
-// ---------------------------------------------------------
-//
-EXPORT_C void CConnectionUiUtilities::CancelWlanPowerSaveTestNote()
- {
- iImpl->CancelWlanPowerSaveTestNote();
- }
-
-// ---------------------------------------------------------
// CConnectionUiUtilities::EasyWapiDlg
// ---------------------------------------------------------
//
@@ -524,7 +504,7 @@
//
EXPORT_C void CConnectionUiUtilities::NoWLANNetworksAvailableNote()
{
- // Note removed.
+ iImpl->NoWLANNetworksAvailableNote();
}
// ---------------------------------------------------------
@@ -607,32 +587,13 @@
// CConnectionUiUtilities::ConnectingViaDiscreetPopup
// ---------------------------------------------------------
//
-EXPORT_C void CConnectionUiUtilities::ConnectingViaDiscreetPopup( )
+EXPORT_C void CConnectionUiUtilities::ConnectingViaDiscreetPopup(
+ const TUint32& aIapId )
{
- iImpl->ConnectingViaDiscreetPopup( );
+ iImpl->ConnectingViaDiscreetPopup( aIapId );
}
// ---------------------------------------------------------
-// CConnectionUiUtilities::ConnectingViaDiscreetPopup
-// ---------------------------------------------------------
-//
-EXPORT_C void CConnectionUiUtilities::ConnectingViaDiscreetPopup(
- const TUint32& aIapId,
- TBool aConnectionAlreadyActive )
- {
- iImpl->ConnectingViaDiscreetPopup( aIapId, aConnectionAlreadyActive );
- }
-
-// ---------------------------------------------------------
-// CConnectionUiUtilities::CancelConnectingViaDiscreetPopup
-// ---------------------------------------------------------
-//
-EXPORT_C void CConnectionUiUtilities::CancelConnectingViaDiscreetPopup()
- {
- iImpl->CancelConnectingViaDiscreetPopup();
- }
-
-// ---------------------------------------------------------
// CConnectionUiUtilities::ConnectionErrorDiscreetPopup
// ---------------------------------------------------------
//