locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/CreateTest/src/CreateTest.cpp
--- a/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/CreateTest/src/CreateTest.cpp Thu Aug 19 10:20:18 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/CreateTest/src/CreateTest.cpp Tue Aug 31 15:37:04 2010 +0300
@@ -17,9 +17,6 @@
-
-#include <e32property.h>
-
#include <lbtcommon.h>
#include <lbterrors.h>
#include <lbtgeoareabase.h>
@@ -37,9 +34,8 @@
#include <lbttriggerdynamicinfo.h>
#include <lbttriggerentry.h>
-
#include "t_triggerfireobserver.h"
-void createtriggerL();
+TInt createtriggerL();
GLDEF_C TInt E32Main()
{
CTrapCleanup* cleanup=CTrapCleanup::New(); // get clean-up stack
@@ -48,16 +44,18 @@
TRAP_IGNORE(CActiveScheduler* scheduler=new(ELeave) CActiveScheduler;
CActiveScheduler::Install(scheduler););
}
- TRAP_IGNORE(createtriggerL());
- RProcess::Rendezvous(KErrNone);
+ TLbtTriggerId trigId = KLbtNullTriggerId;
+ TRAP_IGNORE(trigId = createtriggerL());
+ RProcess::Rendezvous(trigId);
return 0;
}
- void createtriggerL()
+ TInt createtriggerL()
{
RLbtServer lbtserver;
RLbt lbt;
+
User::LeaveIfError( lbtserver.Connect() );
CleanupClosePushL( lbtserver );
User::LeaveIfError( lbt.Open( lbtserver ) );
@@ -105,34 +103,6 @@
notifier->CreateTriggers( lbt,*trig,trigId,EFalse,wait );
wait->Start( );
- RProperty property;
- CleanupClosePushL(property);
-
- //Allow all to ready from status information
- _LIT_SECURITY_POLICY_PASS(EReadPolicyAlwaysPass);
- //Delete the property if already exists
- /*
- User::LeaveIfError(property.Delete(
- KPSUidTriggerIdInfo,
- KLbttesttriggerid
- ));*/
-
- // Read policy is always pass and write device data capability
- // is required to write to the status information P&S key
- property.Define(KPSUidTriggerIdInfo,
- KLbttesttriggerid,
- RProperty::EInt,
- EReadPolicyAlwaysPass,
- TSecurityPolicy(ECapabilityWriteDeviceData) );
-
-
- User::LeaveIfError( property.Attach(KPSUidTriggerIdInfo,
- KLbttesttriggerid) );
-
- User::LeaveIfError( property.Set(KPSUidTriggerIdInfo,
- KLbttesttriggerid,
- trigId));
-
-
- CleanupStack::PopAndDestroy(5,&lbtserver);
+ CleanupStack::PopAndDestroy(4,&lbtserver);
+ return trigId;
}
\ No newline at end of file