bluetooth/btexample/example/btproperties/BTProperties.cpp
branchRCL_3
changeset 56 015fa7494bd2
parent 41 786b94c6f0a4
--- a/bluetooth/btexample/example/btproperties/BTProperties.cpp	Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btexample/example/btproperties/BTProperties.cpp	Wed Oct 13 15:48:34 2010 +0300
@@ -55,56 +55,6 @@
 		}
 	}
 
-void CreateSubscribersL(RPointerArray<CSubscriber>& aSubscribers)
-	{
-	CSubscriber* subscriber = CSubscriber::NewL(test, KPropertyKeyBluetoothGetPHYCount, KNumLinks);
-	
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-	
-	subscriber = CSubscriber::NewL(test, KPropertyKeyBluetoothGetRegistryTableChange, KRegistry);
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-	
-	subscriber = CSubscriber::NewL(test, KPropertyKeyBluetoothGetConnectingStatus, KConnecting);
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-		
-	subscriber = CSubscriber::NewL(test, KPropertyKeyBluetoothGetScanningStatus, KScanning);
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-
-	subscriber = CSubscriber::NewL(test, KPropertyKeyBluetoothGetLimitedDiscoverableStatus, KLimited);
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-	
-	subscriber = CSubscriber::NewL(test, KPropertyKeyBluetoothGetDeviceClass, KDeviceClass);
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-	
-	subscriber = CSubscriber::NewL(test, KPropertyKeyBluetoothGetCorruptRegistryResetIndication, KCorruptRegistry);
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-	
-	subscriber = CDeviceNameSubscriber::NewL(test, KPropertyKeyBluetoothGetDeviceName, KDeviceName);
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-	
-	subscriber = CSubscriber::NewL(test, KPropertyKeyBluetoothHostResolverActive, KDiscovering);
-	CleanupStack::PushL(subscriber);
-	aSubscribers.AppendL(subscriber);
-	CleanupStack::Pop(subscriber);
-	}
-
-
 void TestL()
 	{
 	// first do a sync test
@@ -112,22 +62,27 @@
 
 	RPointerArray<CSubscriber> subscribers;
 
-	TRAPD(err, CreateSubscribersL(subscribers));
+	//ignoring errors!
+	subscribers.Append(CSubscriber::NewL(test, KPropertyKeyBluetoothGetPHYCount, KNumLinks));
+	subscribers.Append(CSubscriber::NewL(test, KPropertyKeyBluetoothGetRegistryTableChange, KRegistry));
+	subscribers.Append(CSubscriber::NewL(test, KPropertyKeyBluetoothGetConnectingStatus, KConnecting));
+	subscribers.Append(CSubscriber::NewL(test, KPropertyKeyBluetoothGetScanningStatus, KScanning));
+	subscribers.Append(CSubscriber::NewL(test, KPropertyKeyBluetoothGetLimitedDiscoverableStatus, KLimited));
+	subscribers.Append(CSubscriber::NewL(test, KPropertyKeyBluetoothGetDeviceClass, KDeviceClass));
+	subscribers.Append(CSubscriber::NewL(test, KPropertyKeyBluetoothGetCorruptRegistryResetIndication, KCorruptRegistry));
+	subscribers.Append(CDeviceNameSubscriber::NewL(test, KPropertyKeyBluetoothGetDeviceName, KDeviceName));
+ 	subscribers.Append(CSubscriber::NewL(test, KPropertyKeyBluetoothHostResolverActive, KDiscovering));
 
 	test.Printf(_L("%d Subscribers\n"), subscribers.Count());
 
-	if (err == KErrNone)
-		{
-		// Only start if no errors when creating the subscribers
-		for (TInt i=0; i<subscribers.Count(); i++)
-			{
-			subscribers[i]->Start();
-			}
-		CActiveScheduler::Start();
-		}
+	for (TInt i=0; i<subscribers.Count(); i++)
+		subscribers[i]->Start();
+
+	CActiveScheduler::Start();
 	subscribers.ResetAndDestroy();
 	}
 
+
 CSubscriber* CSubscriber::NewL(RTest& aTest, TUint aKey, const TDesC& aString)
 	{
 	CSubscriber* s = new(ELeave) CSubscriber(aTest, aString);