--- a/htiui/HtiAdmin/inc/HtiAdminDocument.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiAdmin/inc/HtiAdminDocument.h Fri Feb 19 22:51:38 2010 +0200
@@ -20,7 +20,7 @@
#define __HTIADMIN_DOCUMENT_H__
// INCLUDES
-#include <akndoc.h>
+#include <AknDoc.h>
// FORWARD DECLARATIONS
class CHtiAdminAppUi;
--- a/htiui/HtiAdmin/src/HtiAdminAppUi.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiAdmin/src/HtiAdminAppUi.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <avkon.hrh>
#include <aknnotewrappers.h>
-#include <aknquerydialog.h>
+#include <AknQueryDialog.h>
#include <aknmessagequerydialog.h>
#include <w32std.h>
#include <eikmenup.h>
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/BtSerialClient.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/BtSerialClient.h Fri Feb 19 22:51:38 2010 +0200
@@ -23,8 +23,8 @@
#include <e32base.h>
#include <es_sock.h>
#include <bt_sock.h>
-#include <BTextNotifiers.h>
-#include <BtSdp.h>
+#include <btextnotifiers.h>
+#include <btsdp.h>
#include "SocketObserver.h"
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/btservicesearcher.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/btservicesearcher.h Fri Feb 19 22:51:38 2010 +0200
@@ -24,11 +24,11 @@
#include <bttypes.h>
#include <btextnotifiers.h>
-#include "SdpAttributeParser.h"
-#include "SdpAttributeNotifier.h"
+#include "sdpattributeparser.h"
+#include "sdpattributenotifier.h"
// CONSTANTS
-#include "MessageProtocolConstants.h"
+#include "messageprotocolconstants.h"
// CLASS DECLARATIONS
/**
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/messageservicesearcher.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/messageservicesearcher.h Fri Feb 19 22:51:38 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <e32base.h>
-#include "BTServiceSearcher.h"
+#include "btservicesearcher.h"
// CLASS DECLARATIONS
/**
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/sdpattributeparser.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/sdpattributeparser.h Fri Feb 19 22:51:38 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <btsdp.h>
-#include "StaticArrayC.h"
+#include "staticarrayc.h"
// FORWARD DECLARATIONS
class MSdpAttributeNotifier;
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/socketswriter.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/socketswriter.h Fri Feb 19 22:51:38 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <in_sock.h>
-#include "TimeOutNotifier.h"
+#include "timeoutnotifier.h"
// FORWARD DECLARATIONS
class CTimeOutTimer;
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/staticarrayc.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/staticarrayc.h Fri Feb 19 22:51:38 2010 +0200
@@ -68,7 +68,7 @@
};
// INCLUDES
-#include "StaticArrayC.inl"
+#include "staticarrayc.inl"
/**
* CONSTRUCT_STATIC_ARRAY_C
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/BtSerialClient.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/BtSerialClient.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -21,7 +21,7 @@
#include <btengsettings.h> // CBTEngSettings
#include "BtSerialClient.h"
-#include "MessageServiceSearcher.h"
+#include "messageservicesearcher.h"
#include "BtSerialEngine.pan"
#include "HtiBtEngineLogging.h"
#include "socketswriter.h"
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/btservicesearcher.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/btservicesearcher.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,8 +17,8 @@
// INCLUDE FILES
-#include "BTServiceSearcher.h"
-#include "BTServiceSearcher.pan"
+#include "btservicesearcher.h"
+#include "btservicesearcher.pan"
#include "HtiBtEngineLogging.h"
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/messageservicesearcher.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/messageservicesearcher.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -19,8 +19,8 @@
// INCLUDE FILES
#include <bt_sock.h>
-#include "MessageServiceSearcher.h"
-#include "BTServiceSearcher.pan"
+#include "messageservicesearcher.h"
+#include "btservicesearcher.pan"
// ============================ MEMBER FUNCTIONS ===============================
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/sdpattributeparser.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/sdpattributeparser.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -19,9 +19,9 @@
// INCLUDE FILES
#include <bt_sock.h>
-#include "SdpAttributeParser.h"
-#include "SdpAttributeParser.pan"
-#include "SdpAttributeNotifier.h"
+#include "sdpattributeparser.h"
+#include "sdpattributeparser.pan"
+#include "sdpattributenotifier.h"
// ============================ MEMBER FUNCTIONS ==============================
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/socketsreader.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/socketsreader.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include "BtSerialEngine.pan"
-#include "SocketsReader.h"
+#include "socketsreader.h"
#include "SocketObserver.h"
// -----------------------------------------------------------------------------
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/socketswriter.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/socketswriter.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,8 +17,8 @@
// INCLUDE FILES
-#include "SocketsWriter.h"
-#include "TimeOutTimer.h"
+#include "socketswriter.h"
+#include "timeouttimer.h"
#include "BtSerialEngine.pan"
#include "SocketObserver.h"
#include "HtiBtEngineLogging.h"
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/timeouttimer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/timeouttimer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,8 +17,8 @@
// INCLUDE FILES
-#include "TimeOutTimer.h"
-#include "TimeOutNotifier.h"
+#include "timeouttimer.h"
+#include "timeoutnotifier.h"
#include "HtiBtEngineLogging.h"
// -----------------------------------------------------------------------------
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommEcomPlugin/inc/HtiBtCommEcomPlugin.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommEcomPlugin/inc/HtiBtCommEcomPlugin.h Fri Feb 19 22:51:38 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <c32comm.h>
-#include <HTICommPluginInterface.h> // defined in HtiFramework project
+#include <HtiCommPluginInterface.h> // defined in HtiFramework project
#include "HtiBtCommInterface.h" // RHtiBtCommInterface
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommEcomPlugin/src/HtiBtCommEcomPlugin.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommEcomPlugin/src/HtiBtCommEcomPlugin.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -22,8 +22,8 @@
#include "HtiBtCommEcomPlugin.h"
#include "BtSerialClient.h"
-#include <hticfg.h>
-#include <htilogging.h>
+#include <HtiCfg.h>
+#include <HtiLogging.h>
// CONSTANTS
_LIT( KHtiCfgPath, "\\" ); // root of drive
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/src/HtiBtCommInterface.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/src/HtiBtCommInterface.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -25,7 +25,7 @@
#include "HtiBtCommInterface.h"
#include <e32uid.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
// CONSTANTS
const TUint KBtCommServerDefaultMessageSlots = 4; // Read, write, readCancel, writeCancel
--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/src/HtiBtCommServerSession.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/src/HtiBtCommServerSession.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -29,7 +29,7 @@
#include <e32std.h>
#include <e32svr.h>
-#include <HTICommPluginInterface.h> // KErrComModuleReset;
+#include <HtiCommPluginInterface.h> // KErrComModuleReset;
// CONSTANTS
_LIT(KBtComSessPanic, "BtComSessAssrt");
--- a/htiui/HtiServicePlugins/HtiAppServicePlugin/inc/HtiAppControl.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiAppServicePlugin/inc/HtiAppControl.h Fri Feb 19 22:51:38 2010 +0200
@@ -27,7 +27,7 @@
#include <w32std.h>
#include <SWInstDefs.h>
#include <swi/sisregistryentry.h>
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
// CONSTANTS
--- a/htiui/HtiServicePlugins/HtiAppServicePlugin/src/HtiAppControl.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiAppServicePlugin/src/HtiAppControl.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -29,15 +29,15 @@
#include "HtiAppControl.h"
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
-#include <swinstapi.h>
+#include <SWInstApi.h>
#include <swi/sisregistrysession.h>
#include <swi/sisregistrypackage.h>
#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 )
#include <javaregistryincludes.h>
#endif
-#include <widgetregistryclient.h>
+#include <WidgetRegistryClient.h>
#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 )
using namespace Java;
--- a/htiui/HtiServicePlugins/HtiAudioServicePlugin/inc/HtiAudioServicePlugin.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiAudioServicePlugin/inc/HtiAudioServicePlugin.h Fri Feb 19 22:51:38 2010 +0200
@@ -22,9 +22,9 @@
// INCLUDES
#include <badesca.h>
-#include <HTIServicePluginInterface.h>
-#include <MdaAudioSamplePlayer.h>
-#include <MdaAudioTonePlayer.h>
+#include <HtiServicePluginInterface.h>
+#include <mdaaudiosampleplayer.h>
+#include <mdaaudiotoneplayer.h>
// CONSTANTS
--- a/htiui/HtiServicePlugins/HtiAudioServicePlugin/src/HtiAudioServicePlugin.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiAudioServicePlugin/src/HtiAudioServicePlugin.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -20,12 +20,12 @@
// INCLUDE FILES
#include <apgcli.h>
-#include <audiopreference.h>
+#include <AudioPreference.h>
#include <bautils.h>
#include <e32std.h>
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
-#include <PathInfo.h>
+#include <HtiLogging.h>
+#include <pathinfo.h>
#include "HtiAudioServicePlugin.h"
--- a/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group/HtiKeyEventServicePlugin.mmp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group/HtiKeyEventServicePlugin.mmp Fri Feb 19 22:51:38 2010 +0200
@@ -48,6 +48,7 @@
LIBRARY euser.lib
LIBRARY ws32.lib
LIBRARY flogger.lib
+LIBRARY hal.lib
SMPSAFE
--- a/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/inc/HtiKeyEventServicePlugin.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/inc/HtiKeyEventServicePlugin.h Fri Feb 19 22:51:38 2010 +0200
@@ -21,10 +21,10 @@
#define CHTIKEYEVENTSERVICEPLUGIN_H
// INCLUDES
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
#include <w32std.h>
#include <centralrepository.h>
-#include <CenRepNotifyHandler.h>
+#include <cenrepnotifyhandler.h>
// CONSTANTS
--- a/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/inc/KeyEventHandler.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/inc/KeyEventHandler.h Fri Feb 19 22:51:38 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
#include <w32std.h>
// CONSTANTS
--- a/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/inc/PointerEventHandler.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/inc/PointerEventHandler.h Fri Feb 19 22:51:38 2010 +0200
@@ -15,12 +15,11 @@
*
*/
-
#ifndef CPOINTEREVENTHANDLER_H
#define CPOINTEREVENTHANDLER_H
// INCLUDES
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
#include <w32std.h>
// CONSTANTS
@@ -35,6 +34,7 @@
// CLASS DECLARATION
+
/**
* Functional implentation of pointer event service.
*/
@@ -57,6 +57,8 @@
ETapAndDragMultipoint = 0x12,
EPressPointerDown = 0x13,
ELiftPointerUp = 0x14,
+ EAdvancedTapScreen = 0x15, //for advanced
+ EPinchZoom = 0x16, //for advanced
EResultOk = 0xFF // only for response message
};
@@ -67,6 +69,16 @@
EPointerMoving
};
+ struct TAdvancedPointer
+ {
+ TUint8 PointerNum;
+ TInt X;
+ TInt Y;
+ TInt Z;
+ };
+
+
+
/**
* Two-phased constructor.
*/
@@ -117,6 +129,8 @@
void HandleTapAndDragL( const TDesC8& aData );
void HandleTapAndDragMultipointL( const TDesC8& aData );
void HandlePointerDownOrUpL( const TDesC8& aData );
+ void HandleAdvancedTapScreenL( const TDesC8& aData ); //for advanced
+ void HandlePinchZoomL( const TDesC8& aData ); //for advanced
void SendOkMsgL();
void SendErrorMessageL( TInt aError, const TDesC8& aDescription );
@@ -127,6 +141,10 @@
void PointerUp();
void PointerMove();
void SimulatePointerEvent( TRawEvent::TType aType );
+ TBool IsMultitouch();
+ void AdvanceAddMiddlePointL(TInt aPointNumber,TInt aX1,TInt aY1, TInt aZ1,TInt aX2,TInt aY2, TInt aZ2 , TInt aStepCount );
+ void AdvancedAddDelayArray(TTimeIntervalMicroSeconds32 aDelay , TInt aStepCount );
+ TBool AdvancedStartDelay();
private: // data
@@ -144,6 +162,10 @@
TTimeIntervalMicroSeconds32 iActionDelay;
TPointerState iState;
RArray<TInt>* iCoords;
- };
+ RPointerArray<TAdvancedPointer> iAdvancedPointers;
+
+ RPointerArray<TAdvancedPointer> iAdvPointerMoveArray;
+ RPointerArray<TTimeIntervalMicroSeconds32> iDelayArray;
+ };
#endif // CKEYEVENTHANDLER_H
--- a/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/src/HtiKeyEventServicePlugin.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/src/HtiKeyEventServicePlugin.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,13 +17,13 @@
// INCLUDE FILES
-#include "HtiKeyEventServiceplugin.h"
+#include "HtiKeyEventServicePlugin.h"
#include "KeyEventHandler.h"
#include "PointerEventHandler.h"
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
-#include <HWRMLightDomainCRKeys.h>
+#include <HtiLogging.h>
+#include <hwrmlightdomaincrkeys.h>
// CONSTANTS
_LIT8( KErrorMissingCommand, "Command was not given - message was empty" );
--- a/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/src/KeyEventHandler.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/src/KeyEventHandler.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,12 +17,12 @@
// INCLUDE FILES
-#include "HtiKeyEventServiceplugin.h"
+#include "HtiKeyEventServicePlugin.h"
#include "KeyEventHandler.h"
#include <apgtask.h>
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
// CONSTANTS
--- a/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/src/PointerEventHandler.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/src/PointerEventHandler.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -15,13 +15,12 @@
*
*/
-
// INCLUDE FILES
-#include "HtiKeyEventServiceplugin.h"
+#include "HtiKeyEventServicePlugin.h"
#include "PointerEventHandler.h"
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
// CONSTANTS
@@ -30,10 +29,14 @@
_LIT8( KErrorInvalidParameters, "Command parameters not valid" );
_LIT8( KErrorUnrecognizedCommand, "Unrecognized command" );
_LIT8( KErrorInternalFailure, "Internal pointer command failure" );
+_LIT8( KErrorGetHALData, "Can not get the HAL data" );
const TInt KTapCmdLength = 10;
const TInt KDragMultiCmdMinLength = 14;
const TInt KSinglePointerCmdLength = 4;
+const TInt KAdvancedTapScreenCmdMinLength = 16;
+const TInt KPinchZoomCmdMinLength = 30;
+
// ----------------------------------------------------------------------------
// CPointerEventHandler::NewL()
@@ -72,6 +75,10 @@
iCoords->Close();
}
delete iCoords;
+
+ iAdvancedPointers.ResetAndDestroy();
+ iDelayArray.ResetAndDestroy();
+ iAdvPointerMoveArray.ResetAndDestroy();
}
// ----------------------------------------------------------------------------
@@ -100,12 +107,12 @@
{
HTI_LOG_FUNC_IN( "CPointerEventHandler::RunL" );
- if ( iCommand == ETapScreen )
+ if ( iCommand == ETapScreen || iCommand == EAdvancedTapScreen )
{
ChangePointerStateL();
}
- else if ( iCommand == ETapAndDrag && iState == EPointerDown )
+ else if ( iCommand == ETapAndDrag && iState == EPointerDown )
{
PointerMove();
PointerUp();
@@ -127,7 +134,16 @@
MoveToNextPointL(); // Continuing current line
}
}
-
+ else if ( iCommand == EPinchZoom )
+ {
+ PointerMove();
+ if ( !AdvancedStartDelay())
+ {
+ PointerUp();
+ SendOkMsgL();
+ iReady = ETrue;
+ }
+ }
HTI_LOG_FUNC_OUT( "CPointerEventHandler::RunL" );
}
@@ -194,6 +210,13 @@
case ELiftPointerUp:
HandlePointerDownOrUpL( aMessage.Right( aMessage.Length() - 1 ) );
break;
+ case EAdvancedTapScreen:
+ HandleAdvancedTapScreenL( aMessage.Right( aMessage.Length() - 1 ) );
+ break;
+ case EPinchZoom:
+ HandlePinchZoomL( aMessage.Right( aMessage.Length() - 1 ) );
+ break;
+
default:
SendErrorMessageL( EUnrecognizedCommand,
KErrorUnrecognizedCommand );
@@ -240,6 +263,8 @@
HTI_LOG_FUNC_OUT( "CPointerEventHandler::HandleTapScreenL" );
}
+
+
// ----------------------------------------------------------------------------
// CPointerEventHandler::HandleTapAndDragL()
@@ -409,6 +434,237 @@
}
HTI_LOG_FUNC_OUT( "CPointerEventHandler::ChangePointerStateL" );
}
+
+ // ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// CPointerEventHandler::HandleAdvancedTapScreenL()
+// ****cherry.
+// ----------------------------------------------------------------------------
+
+void CPointerEventHandler::HandleAdvancedTapScreenL( const TDesC8& aData )
+ {
+
+ HTI_LOG_FUNC_IN( "CPointerEventHandler::HandleAdvancedTapScreenL" );
+
+ if ( aData.Length() < KAdvancedTapScreenCmdMinLength ) //KAdvancedTapScreenCmdMinLength needs to be defined
+ {
+ SendErrorMessageL( EInvalidParameters, KErrorInvalidParameters );
+ return;
+ }
+ TInt dataLength = aData.Length();
+
+ // Parse the parameters - correct length is already verified
+ TInt offset = 0;
+
+ iEventDelay = ( aData[offset] + ( aData[offset+1] << 8 ) ) * 1000;
+ offset += 2;
+ HTI_LOG_FORMAT( "Time to hold down = %d", iEventDelay.Int() );
+ iTapCount = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Tap count = %d", iTapCount );
+ iActionDelay = ( aData[offset] + ( aData[offset+1] << 8 ) ) * 1000;
+ offset += 2;
+ HTI_LOG_FORMAT( "Pause between taps = %d", iActionDelay.Int() );
+ TInt pointerCount = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Pointer Count = %d", pointerCount );
+
+ iAdvancedPointers.ResetAndDestroy();
+
+ // Read integers from aData to the array, all integers are 2 bytes
+ for ( TInt i = 0; i < pointerCount; i++ )
+ {
+ TAdvancedPointer* advancedPointer = new (ELeave) TAdvancedPointer;
+
+ advancedPointer->PointerNum = aData[offset];
+ offset += 1;
+ HTI_LOG_FORMAT( "%d Pointer", advancedPointer->PointerNum );
+
+ advancedPointer->X = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "X coord down = %d", advancedPointer->X );
+
+ advancedPointer->Y = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Y coord down = %d", advancedPointer->Y );
+
+ advancedPointer->Z = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Z coord down = %d", advancedPointer->Z );
+
+ iAdvancedPointers.AppendL( advancedPointer );
+ }
+
+ // Start tapping
+ iReady = EFalse;
+ ChangePointerStateL();
+
+ HTI_LOG_FUNC_OUT( "CPointerEventHandler::HandleAdvancedTapScreenL" );
+
+ }
+
+// ----------------------------------------------------------------------------
+// CPointerEventHandler::HandlePinchZoomL()
+// ****cherry
+// ----------------------------------------------------------------------------
+void CPointerEventHandler::HandlePinchZoomL( const TDesC8& aData )
+ {
+ HTI_LOG_FUNC_IN( "CPointerEventHandler::HandlePinchZoomL" );
+
+ if ( aData.Length() < KPinchZoomCmdMinLength ) //KPinchZoomCmdMinLength needs to be defined
+ {
+ SendErrorMessageL( EInvalidParameters, KErrorInvalidParameters );
+ return;
+ }
+ TInt dataLength = aData.Length();
+
+ // Parse the parameters - correct length is already verified
+ TInt offset = 0;
+
+ TTimeIntervalMicroSeconds32 eventDelay = ( aData[offset] + ( aData[offset+1] << 8 ) ) * 1000;
+ offset += 2;
+ HTI_LOG_FORMAT( "Event time = %d", eventDelay.Int() );
+
+ TInt stepCount = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Step Count = %d", stepCount );
+
+ TInt pointerCount = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Pointer Count = %d", pointerCount );
+
+ iAdvPointerMoveArray.ResetAndDestroy();
+
+ // Read integers from aData to the array, all integers are 2 bytes
+ for ( TInt i = 0; i < pointerCount; i++ )
+ {
+ TInt pointNumber,X1, Y1, Z1,X2,Y2, Z2 ;
+
+ // start point
+ pointNumber = aData[offset];
+ offset += 1;
+ HTI_LOG_FORMAT( "%d Pointer Start", pointNumber );
+
+ X1 = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "X coord down = %d", X1 );
+
+ Y1 = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Y coord down = %d", Y1 );
+
+ Z1 = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Z coord down = %d", Z1 );
+
+ // end point
+ X2 = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "X coord down = %d", X2 );
+
+ Y2 = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Y coord down = %d", Y2 );
+
+ Z2 = aData[offset] + ( aData[offset+1] << 8 );
+ offset += 2;
+ HTI_LOG_FORMAT( "Z coord down = %d", Z2 );
+
+ AdvanceAddMiddlePointL(pointNumber,X1, Y1, Z1,X2,Y2, Z2,stepCount );
+
+ }
+
+ AdvancedAddDelayArray(eventDelay,stepCount);
+
+ iReady = EFalse;
+ PointerDown();
+
+ if (!AdvancedStartDelay())
+ {
+ SendErrorMessageL( EInvalidParameters, KErrorInvalidParameters );
+ return;
+ }
+
+ HTI_LOG_FUNC_OUT( "CPointerEventHandler::HandlePinchZoomL" );
+ }
+
+// ----------------------------------------------------------------------------
+// CPointerEventHandler::AdvancedStartDelay()
+// ----------------------------------------------------------------------------
+TBool CPointerEventHandler::AdvancedStartDelay()
+ {
+ HTI_LOG_FUNC_IN( "CPointerEventHandler::AdvancedStartDelay" );
+ TBool ret=EFalse;
+ if (iDelayArray.Count()>0)
+ {
+ TTimeIntervalMicroSeconds32* time=iDelayArray[0];
+ iDelayArray.Remove(0);
+ ret=ETrue;
+
+ iTimer.After( iStatus, *time );
+ delete time;
+ SetActive();
+ }
+ HTI_LOG_FUNC_OUT( "CPointerEventHandler::AdvancedStartDelay" );
+ return ret;
+ }
+
+// ----------------------------------------------------------------------------
+// CPointerEventHandler::AdvanceAddMiddlePointL()
+// ----------------------------------------------------------------------------
+void CPointerEventHandler::AdvanceAddMiddlePointL(TInt aPointNumber,TInt aX1,TInt aY1, TInt aZ1,
+ TInt aX2,TInt aY2, TInt aZ2 , TInt aStepCount )
+ {
+ HTI_LOG_FUNC_IN( "CPointerEventHandler::AdvanceAddMiddlePointL" );
+ TInt dx=(aX2-aX1)/aStepCount;
+ TInt dy=(aY2-aY1)/aStepCount;
+
+ for (TInt i=0;i<=aStepCount+1;i++)
+ {
+ TAdvancedPointer* point = new (ELeave) TAdvancedPointer;
+ CleanupStack::PushL(point);
+ iAdvPointerMoveArray.AppendL(point);
+ CleanupStack::Pop();
+
+ point->PointerNum=aPointNumber;
+ if (i<aStepCount)
+ {
+ point->X=aX1+i*dx;
+ point->Y=aY1+i*dy;
+ point->Z=aZ1;
+ }
+ else
+ {
+ point->X=aX2;
+ point->Y=aY2;
+ point->Z=aZ2;
+ }
+
+ }
+
+ HTI_LOG_FUNC_OUT( "CPointerEventHandler::AdvanceAddMiddlePointL" );
+ }
+
+// ----------------------------------------------------------------------------
+// CPointerEventHandler::AdvancedAddDelayArray()
+// ----------------------------------------------------------------------------
+void CPointerEventHandler::AdvancedAddDelayArray(TTimeIntervalMicroSeconds32 aDelay , TInt aStepCount )
+ {
+ HTI_LOG_FUNC_IN( "CPointerEventHandler::AdvancedAddDelayArray" );
+
+ TInt interval=aDelay.Int()/aStepCount;
+ iDelayArray.ResetAndDestroy();
+
+ for (TInt i=0;i<aStepCount;i++)
+ {
+ TTimeIntervalMicroSeconds32* time = new (ELeave) TTimeIntervalMicroSeconds32(interval);
+ CleanupStack::PushL(time);
+ iDelayArray.AppendL(time);
+ CleanupStack::Pop(time);
+ }
+ HTI_LOG_FUNC_OUT( "CPointerEventHandler::AdvancedAddDelayArray" );
+ }
// ----------------------------------------------------------------------------
// CPointerEventHandler::MoveToNextPointL()
@@ -502,14 +758,76 @@
void CPointerEventHandler::SimulatePointerEvent( TRawEvent::TType aType )
{
HTI_LOG_FUNC_IN( "CPointerEventHandler::SimulatePointerEvent" );
+
TRawEvent rawEvent;
- rawEvent.Set( aType, iX, iY );
- iWsSession.SimulateRawEvent( rawEvent );
+
+ if ( iCommand == EAdvancedTapScreen )
+ {
+ TInt i;
+ for ( i = 0; i < iAdvancedPointers.Count(); i++ )
+ {
+ rawEvent.SetPointerNumber( iAdvancedPointers[i]->PointerNum );
+ rawEvent.Set( aType, iAdvancedPointers[i]->X, iAdvancedPointers[i]->Y, iAdvancedPointers[i]->Z);
+ iWsSession.SimulateRawEvent( rawEvent );
+ }
+ }
+ else if ( iCommand == EPinchZoom )
+ {
+ TInt i,index,pointnum=-1;
+ RPointerArray<TAdvancedPointer> array;
+ for ( i = 0; i < iAdvPointerMoveArray.Count(); i++ )
+ {
+ TAdvancedPointer* point=iAdvPointerMoveArray[i];
+ if (point->PointerNum!=pointnum)
+ {
+ pointnum=point->PointerNum;
+ rawEvent.SetPointerNumber( point->PointerNum );
+ rawEvent.Set( aType, point->X, point->Y, point->Z);
+ iWsSession.SimulateRawEvent( rawEvent );
+
+ HTI_LOG_FORMAT( "SimulateAdvanced event=%d ", aType );
+ HTI_LOG_FORMAT( "SimulateAdvanced PointerNum=%d", point->PointerNum );
+ HTI_LOG_FORMAT( "SimulateAdvanced X=%d ", point->X );
+ HTI_LOG_FORMAT( "SimulateAdvanced Y=%d ", point->Y );
+ HTI_LOG_FORMAT( "SimulateAdvanced Z=%d", point->Z );
+
+ array.Append(point);
+ }
+ }
+ for (i=0;i<array.Count();i++)
+ {
+ index=iAdvPointerMoveArray.Find(array[i]);
+ if (index!=KErrNotFound)
+ iAdvPointerMoveArray.Remove(index);
+ }
+ array.ResetAndDestroy();
+ }
+ else
+ {
+ rawEvent.Set( aType, iX, iY );
+ iWsSession.SimulateRawEvent( rawEvent );
+ }
+
iWsSession.Flush();
HTI_LOG_FUNC_OUT( "CPointerEventHandler::SimulatePointerEvent" );
}
// ----------------------------------------------------------------------------
+// CPointerEventHandler::IsMultitouch()
+// ----------------------------------------------------------------------------
+TBool CPointerEventHandler::IsMultitouch()
+ {
+ HTI_LOG_FUNC_IN("CPointerEventHandler::IsMultitouch");
+ TBool isMultitouch = EFalse;
+ if ( iCommand == EAdvancedTapScreen || iCommand == EPinchZoom )
+ {
+ isMultitouch = ETrue;
+ }
+ HTI_LOG_FUNC_OUT("CPointerEventHandler::IsMultitouch");
+ return isMultitouch;
+ }
+
+// ----------------------------------------------------------------------------
// CPointerEventHandler::SendOkMsgL()
// ----------------------------------------------------------------------------
void CPointerEventHandler::SendOkMsgL()
--- a/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group/HtiMessagesServicePlugin.mmp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group/HtiMessagesServicePlugin.mmp Fri Feb 19 22:51:38 2010 +0200
@@ -60,7 +60,6 @@
LIBRARY etel.lib
LIBRARY etelmm.lib
LIBRARY etext.lib
-LIBRARY imumutils.lib
LIBRARY mmsserversettings.lib
LIBRARY flogger.lib
--- a/htiui/HtiServicePlugins/HtiMessagesServicePlugin/src/HtiMessagesServicePlugin.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiMessagesServicePlugin/src/HtiMessagesServicePlugin.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -53,6 +53,7 @@
delete iMessageHandler;
delete iIAPHandler;
delete iMailboxHandler;
+ delete iMsgSettingsHandler;
}
// ----------------------------------------------------------------------------
--- a/htiui/HtiServicePlugins/HtiMessagesServicePlugin/src/MessageMgmntHandler.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiMessagesServicePlugin/src/MessageMgmntHandler.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -838,7 +838,7 @@
waiter->StartAndWait();
CleanupStack::PopAndDestroy( waiter );
HTI_LOG_TEXT( "Attachment added succesfully" );
-
+ ls.Close();
attachmentsExist = ETrue;
}
@@ -1191,7 +1191,7 @@
CSmsHeader* smsHeader = &( smsMtm->SmsHeader() );
delete smsHeader;
smsHeader = NULL;
- smsHeader = CSmsHeader::NewL( CSmsPDU::ESmsDeliver, smsMtm->Body() );
+ smsHeader = CSmsHeader::NewL( CSmsPDU::ESmsSubmit, smsMtm->Body() );
smsHeader->SetFromAddressL( fromTo->Des() );
// set body, the actual BIO message content
--- a/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/inc/HtiScreenshotServicePlugin.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/inc/HtiScreenshotServicePlugin.h Fri Feb 19 22:51:38 2010 +0200
@@ -21,7 +21,7 @@
#define SCREENSHOOTPLUGIN_H
// INCLUDES
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
#include <w32std.h>
#include <f32file.h>
#include "HtiTextRcg.h"
--- a/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/src/HtiScreenshotServicePlugin.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/src/HtiScreenshotServicePlugin.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -19,10 +19,10 @@
// INCLUDE FILES
#include "HtiScreenshotServicePlugin.h"
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
-#include <ImageConversion.h>
-#include <EZCompressor.h>
+#include <imageconversion.h>
+#include <ezcompressor.h>
#include <hal.h>
// CONSTANTS
--- a/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/src/HtiTextRcg.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/src/HtiTextRcg.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
#include "HtiTextRcg.h"
#include <AknUtils.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
const static TInt KDefaultStrategy = EHintEdge;
--- a/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/inc/HtiLightsController.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/inc/HtiLightsController.h Fri Feb 19 22:51:38 2010 +0200
@@ -22,7 +22,7 @@
// INCLUDES
#include <e32base.h>
-#include <HWRMLight.h>
+#include <hwrmlight.h>
// FORWARD DECLARATIONS
class MHtiDispatcher;
--- a/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/inc/HtiSysInfoServicePlugin.h Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/inc/HtiSysInfoServicePlugin.h Fri Feb 19 22:51:38 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32property.h>
#include <f32file.h>
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
// FORWARD DECLARATIONS
class CHtiLightsController;
--- a/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/src/HtiLightsController.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/src/HtiLightsController.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
#include "HtiLightsController.h"
// CONSTANTS
--- a/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/src/HtiPropertySubscriber.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/src/HtiPropertySubscriber.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,7 +17,7 @@
// INCLUDE FILES
-#include <HTILogging.h>
+#include <HtiLogging.h>
#include "HtiPropertySubscriber.h"
// CONSTANTS
--- a/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/src/HtiSysInfoServicePlugin.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/src/HtiSysInfoServicePlugin.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,16 +17,16 @@
// INCLUDE FILES
-#include "HtiSysInfoServiceplugin.h"
+#include "HtiSysInfoServicePlugin.h"
#include "HtiLightsController.h"
#include "HtiPropertySubscriber.h"
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
#include <aknkeylock.h>
#include <AknSkinsInternalCRKeys.h>
#include <AknsSkinUID.h>
-#include <AknSSrvClient.h>
+#include <AknsSrvClient.h>
#include <bautils.h>
#include <btengsettings.h>
#include <btengdomaincrkeys.h>
@@ -41,10 +41,10 @@
#include <hal.h>
#include <ir_sock.h>
#include <mmtsy_names.h>
-#include <RMmCustomAPI.h>
-#include <HWRMPowerStateSDKPSKeys.h>
-#include <ScreenSaverInternalPSKeys.h>
-#include <SettingsInternalCRKeys.h>
+#include <rmmcustomapi.h>
+#include <hwrmpowerstatesdkpskeys.h>
+#include <ScreensaverInternalPSKeys.h>
+#include <settingsinternalcrkeys.h>
#include <sysutil.h>
#include <tz.h>
--- a/htiui/group/bld.inf Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/group/bld.inf Fri Feb 19 22:51:38 2010 +0200
@@ -31,8 +31,8 @@
#include "../HtiServicePlugins/HtiAppServicePlugin/group/bld.inf"
#include "../HtiServicePlugins/HtiAudioServicePlugin/group/bld.inf"
#include "../HtiServicePlugins/HtiKeyEventServicePlugin/group/bld.inf"
+#include "../HtiServicePlugins/HtiMessagesServicePlugin/group/bld.inf"
#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 )
- #include "../HtiServicePlugins/HtiMessagesServicePlugin/group/bld.inf"
#include "../HtiServicePlugins/HtiPIMServicePlugin/group/bld.inf"
#endif
#include "../HtiServicePlugins/HtiScreenshotServicePlugin/group/bld.inf"
--- a/htiui/sis/HTI_S60-51.pkg Tue Feb 02 00:17:27 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-;
-; Copyright (c) 2009 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"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: Installation file for HTI
-
-
-; Languages
-&EN
-
-; Using UID of HtiFramework project
-#{"HTI"},(0x1020DEB6),2,15,0
-
-; Series60 product id for S60 5.1
-[0x10283160], 0, 0, 0, {"Series60ProductID"}
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-; Install files
-
-; HtiCfg library
-"\epoc32\release\armv5\urel\HtiCfg.dll" - "!:\sys\bin\HtiCfg.dll"
-
-; HtiAdmin
-"\epoc32\release\armv5\urel\HtiAdmin.exe" - "!:\sys\bin\HtiAdmin.exe"
-"\epoc32\data\Z\Resource\apps\HtiAdmin.rsc" - "!:\Resource\Apps\HtiAdmin.rsc"
-"\epoc32\data\Z\private\10003a3f\apps\HtiAdmin_reg.rsc" - "!:\private\10003a3f\import\apps\HtiAdmin_reg.rsc"
-
-; Serial comm module
-"\epoc32\data\Z\Resource\Plugins\HtiSerialCommEcomPlugin.rsc" - "!:\Resource\Plugins\HtiSerialCommEcomPlugin.rsc"
-"\epoc32\release\armv5\urel\HtiSerialCommEcomPlugin.dll" - "!:\sys\bin\HtiSerialCommEcomPlugin.dll"
-
-; BtSerial comm module
-"\epoc32\release\armv5\urel\HtiBtSerialComHelper.dll" - "!:\sys\bin\HtiBtSerialComHelper.dll"
-"\epoc32\release\armv5\urel\HtiBtCommServer.dll" - "!:\sys\bin\HtiBtCommServer.dll"
-"\epoc32\release\armv5\urel\HtiBtCommInterface.dll" - "!:\sys\bin\HtiBtCommInterface.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiBtCommEcomPlugin.rsc" - "!:\Resource\Plugins\HtiBtCommEcomPlugin.rsc"
-"\epoc32\release\armv5\urel\HtiBtCommEcomPlugin.dll" - "!:\sys\bin\HtiBtCommEcomPlugin.dll"
-
-; IPComm module
-"\epoc32\release\armv5\urel\HtiIPCommServer.exe" - "!:\sys\bin\HtiIPCommServer.exe"
-"\epoc32\release\armv5\urel\HtiIPCommServerClient.dll" - "!:\sys\bin\HtiIPCommServerClient.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiIPCommEcomPlugin.rsc" - "!:\Resource\Plugins\HtiIPCommEcomPlugin.rsc"
-"\epoc32\release\armv5\urel\HtiIPCommEcomPlugin.dll" - "!:\sys\bin\HtiIPCommEcomPlugin.dll"
-
-; USB serial comm module
-"\epoc32\data\Z\Resource\Plugins\HtiUsbSerialCommEcomPlugin.rsc" - "!:\Resource\Plugins\HtiUsbSerialCommEcomPlugin.rsc"
-"\epoc32\release\armv5\urel\HtiUsbSerialCommEcomPlugin.dll" - "!:\sys\bin\HtiUsbSerialCommEcomPlugin.dll"
-
-; Test service plug-ins
-"\epoc32\release\armv5\urel\HtiEchoServicePlugin.dll" - "!:\sys\bin\HtiEchoServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiEchoServicePlugin.rsc" - "!:\Resource\Plugins\HtiEchoServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiKeyEventServicePlugin.dll" - "!:\sys\bin\HtiKeyEventServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiKeyEventServicePlugin.rsc" - "!:\Resource\Plugins\HtiKeyEventServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiScreenshotServicePlugin.dll" - "!:\sys\bin\HtiScreenshotServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiScreenshotServicePlugin.rsc" - "!:\Resource\Plugins\HtiScreenshotServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiFtpServicePlugin.dll" - "!:\sys\bin\HtiFtpServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiFtpServicePlugin.rsc" - "!:\Resource\Plugins\HtiFtpServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiAppServicePlugin.dll" - "!:\sys\bin\HtiAppServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiAppServicePlugin.rsc" - "!:\Resource\Plugins\HtiAppServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiAppControl.dll" - "!:\sys\bin\HtiAppControl.dll"
-"\epoc32\release\armv5\urel\HtiStifTfServicePlugin.dll" - "!:\sys\bin\HtiStifTfServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiStifTfServicePlugin.rsc" - "!:\Resource\Plugins\HtiStifTfServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiSysInfoServicePlugin.dll" - "!:\sys\bin\HtiSysInfoServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiSysInfoServicePlugin.rsc" - "!:\Resource\Plugins\HtiSysInfoServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiAudioServicePlugin.dll" - "!:\sys\bin\HtiAudioServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiAudioServicePlugin.rsc" - "!:\Resource\Plugins\HtiAudioServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiMessagesServicePlugin.dll" - "!:\sys\bin\HtiMessagesServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiMessagesServicePlugin.rsc" - "!:\Resource\Plugins\HtiMessagesServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiPIMServicePlugin.dll" - "!:\sys\bin\HtiPIMServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiPIMServicePlugin.rsc" - "!:\Resource\Plugins\HtiPIMServicePlugin.rsc"
-"\epoc32\release\armv5\urel\HtiIpProxyServicePlugin.dll" - "!:\sys\bin\HtiIpProxyServicePlugin.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiIpProxyServicePlugin.rsc" - "!:\Resource\Plugins\HtiIpProxyServicePlugin.rsc"
-
-; Helper to add notepad memos
-"\epoc32\release\armv5\urel\HtiNpdHlp.exe" - "!:\sys\bin\HtiNpdHlp.exe"
-
-; File helper with capability ALL - for file operations to TCB folders
-"\epoc32\release\armv5\urel\HtiFileHlp.exe" - "!:\sys\bin\HtiFileHlp.exe"
-
-; Backup fake DLL used by HtiFtpServicePlugin
-"\epoc32\release\armv5\urel\HtiFtpBackupFake.dll" - "!:\sys\bin\HtiFtpBackupFake.dll"
-
-; HTI watchdog
-"\epoc32\release\armv5\urel\HtiWatchDog.exe" - "!:\sys\bin\HtiWatchDog.exe"
-
-; HTI device reboot
-"\epoc32\release\armv5\urel\HtiDeviceRebootUI.exe" - "!:\sys\bin\HtiDeviceRebootUI.exe"
-
-; HTI Framework
-"\epoc32\release\armv5\urel\HTIFramework.exe" - "!:\sys\bin\HTIFramework.exe"
-
-; AutoStart recogniser plug-in
-"\epoc32\release\armv5\urel\HtiAutoStart.dll" - "!:\sys\bin\HtiAutoStart.dll"
-"\epoc32\data\Z\Resource\Plugins\HtiAutoStart.rsc" - "!:\Resource\Plugins\HtiAutoStart.rsc"
-
-; HTI startup wait
-"\epoc32\release\armv5\urel\HtiStartupWait.dll" - "!:\sys\bin\HtiStartupWait.dll"
-
-; Startup list resource file for starting HTIFramework.exe in device boot
-"\epoc32\data\Z\private\101f875a\import\1020deb6.rsc" - "c:\private\101f875a\import\[1020deb6].rsc"
--- a/htiui/sis/HTI_S60-52.pkg Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/sis/HTI_S60-52.pkg Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
&EN
; Using UID of HtiFramework project
-#{"HTI"},(0x1020DEB6),2,15,0
+#{"HTI"},(0x1020DEB6),2,16,0
; Series60 product id for S60 5.2
[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
--- a/htiui/sis/HTI_stub.pkg Tue Feb 02 00:17:27 2010 +0200
+++ b/htiui/sis/HTI_stub.pkg Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
&EN
; Using UID of HtiFramework project
-#{"HTI"},(0x1020DEB6),2,15,0
+#{"HTI"},(0x1020DEB6),2,16,0
; Localised Vendor name
%{"Nokia"}
--- a/memspyui/data/memspyui.rss Tue Feb 02 00:17:27 2010 +0200
+++ b/memspyui/data/memspyui.rss Fri Feb 19 22:51:38 2010 +0200
@@ -23,7 +23,7 @@
#include <data_caging_paths_strings.hrh>
#include <appinfo.rh>
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <eikon.rsg>
#include <avkon.rh>
#include <eikon.rsg>
--- a/perfmon/inc/perfmon_appui.h Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/inc/perfmon_appui.h Fri Feb 19 22:51:38 2010 +0200
@@ -24,7 +24,7 @@
#include <eikdoc.h>
#include <e32std.h>
#include <coeccntx.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <akntabgrp.h>
#include <aknnavide.h>
#include "perfmon_std.h"
--- a/perfmon/inc/perfmon_document.h Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/inc/perfmon_document.h Fri Feb 19 22:51:38 2010 +0200
@@ -20,7 +20,7 @@
#define PERFMON_DOCUMENT_H
// INCLUDES
-#include <akndoc.h>
+#include <AknDoc.h>
// CONSTANTS
--- a/perfmon/inc/perfmon_settingsviewdlg.h Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/inc/perfmon_settingsviewdlg.h Fri Feb 19 22:51:38 2010 +0200
@@ -20,9 +20,9 @@
#define PERFMON_SETTINGSVIEWDLG_H
// INCLUDES
-#include <akndialog.h>
+#include <AknDialog.h>
#include <eiklbo.h>
-#include <akntabobserver.h>
+#include <AknTabObserver.h>
#include <akntabgrp.h>
#include <aknsettingitemlist.h>
#include <akncheckboxsettingpage.h>
--- a/perfmon/src/perfmon_appui.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/src/perfmon_appui.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -27,7 +27,7 @@
#include <perfmon.rsg>
#include <avkon.hrh>
-#include <aknquerydialog.h>
+#include <AknQueryDialog.h>
#include <aknmessagequerydialog.h>
--- a/perfmon/src/perfmon_datapopupcontainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/src/perfmon_datapopupcontainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -23,7 +23,7 @@
#include "perfmon_appui.h"
#include "perfmon_model.h"
-#include <aknutils.h>
+#include <AknUtils.h>
_LIT(KPercentageFormat,"%S %d%%");
_LIT(KFreeFormat,"%S free %S%S");
--- a/perfmon/src/perfmon_graphscontainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/src/perfmon_graphscontainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -23,7 +23,7 @@
#include "perfmon_appui.h"
#include "perfmon_model.h"
-#include <aknutils.h>
+#include <AknUtils.h>
const TInt KAmountOfMicroSecondsFitsScreen = 20 * 1000000;
#define KRgbCustomGrey TRgb(0x808080)
--- a/perfmon/src/perfmon_graphsview.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/src/perfmon_graphsview.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -25,7 +25,7 @@
#include <perfmon.rsg>
#include <eikenv.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
// ================= MEMBER FUNCTIONS =======================
--- a/perfmon/src/perfmon_settingsviewdlg.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/src/perfmon_settingsviewdlg.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -24,12 +24,12 @@
#include <perfmon.rsg>
#include <aknsettingitemlist.h>
-#include <caknmemoryselectionsettingitem.h>
+#include <CAknMemorySelectionSettingItem.h>
#include <aknlists.h>
#include <akntitle.h>
#include <aknnavi.h>
#include <aknnavide.h>
-#include <stringloader.h>
+#include <StringLoader.h>
#include <aknnotewrappers.h>
// ===================================== MEMBER FUNCTIONS =====================================
--- a/perfmon/src/perfmon_valuescontainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/src/perfmon_valuescontainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -23,7 +23,7 @@
#include "perfmon_appui.h"
#include "perfmon_model.h"
-#include <aknutils.h>
+#include <AknUtils.h>
_LIT(KPercentageFormat,"%S %d%%");
_LIT(KFreeFormat,"%S free %S%S");
--- a/perfmon/src/perfmon_valuesview.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/perfmon/src/perfmon_valuesview.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -25,7 +25,7 @@
#include <perfmon.rsg>
#include <eikenv.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
// ================= MEMBER FUNCTIONS =======================
--- a/stifui/group/ReleaseNote.txt Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/group/ReleaseNote.txt Fri Feb 19 22:51:38 2010 +0200
@@ -1,5 +1,5 @@
========================================================================
-RELEASE NOTE FOR STIF UI - STIF_200952 (7.3.23)
+RELEASE NOTE FOR STIF UI - STIF_201003 (7.3.25)
SUPPORTING SERIES 60 3.0 ->
========================================================================
Binary file stifui/sis/Stifui_31.sis has changed
--- a/stifui/stifui/inc/AppUIAppUi.h Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/inc/AppUIAppUi.h Fri Feb 19 22:51:38 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <eikapp.h>
#include <e32std.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <akntabgrp.h>
#include <aknnavide.h>
#include <StifLogger.h>
--- a/stifui/stifui/inc/AppUIDocument.h Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/inc/AppUIDocument.h Fri Feb 19 22:51:38 2010 +0200
@@ -19,7 +19,7 @@
#define APPUIDOCUMENT_H
// INCLUDES
-#include <akndoc.h>
+#include <AknDoc.h>
// CONSTANTS
--- a/stifui/stifui/inc/version.h Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/inc/version.h Fri Feb 19 22:51:38 2010 +0200
@@ -20,9 +20,9 @@
#define STIFUI_MAJOR_VERSION 7
#define STIFUI_MINOR_VERSION 3
-#define STIFUI_BUILD_VERSION 23
+#define STIFUI_BUILD_VERSION 25
-#define STIFUI_REL_DATE "22nd Dec 2009"
+#define STIFUI_REL_DATE "19th Jan 2010"
#define TO_UNICODE(text) _L(text)
--- a/stifui/stifui/src/Container.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/Container.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <aknnotewrappers.h>
#include <eikclbd.h> // CColumnListBoxData
--- a/stifui/stifui/src/CreatedTestSetMenuContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/CreatedTestSetMenuContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <aknnotewrappers.h>
#include <eikclbd.h> // CColumnListBoxData
--- a/stifui/stifui/src/CreatedTestSetMenuView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/CreatedTestSetMenuView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,7 +17,7 @@
// INCLUDE FILES
#include <eikmenub.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <aknlistquerydialog.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
--- a/stifui/stifui/src/MainMenuView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/MainMenuView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -16,7 +16,7 @@
*/
// INCLUDE FILES
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
#include "MainMenuView.h"
--- a/stifui/stifui/src/ShowStartedCasesContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/ShowStartedCasesContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <badesca.h> // CDesCArray
#include <eikclbd.h> // CColumnListBoxData
#include <aknnotewrappers.h>
--- a/stifui/stifui/src/ShowStartedCasesView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/ShowStartedCasesView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <eikmenub.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
--- a/stifui/stifui/src/StartCasesContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/StartCasesContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <aknnotewrappers.h>
#include <eikclbd.h> // CColumnListBoxData
--- a/stifui/stifui/src/StartCasesView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/StartCasesView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,7 +17,7 @@
// INCLUDE FILES
#include <eikmenub.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <aknlistquerydialog.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
--- a/stifui/stifui/src/StartedCasesMenuView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/StartedCasesMenuView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,7 +17,7 @@
*/
// INCLUDE FILES
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
#include "StartedCasesMenuView.h"
--- a/stifui/stifui/src/StatisticsContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/StatisticsContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <aknnotewrappers.h>
#include <eikclbd.h> // CColumnListBoxData
--- a/stifui/stifui/src/StatisticsView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/StatisticsView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <eikmenub.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <aknlistquerydialog.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
--- a/stifui/stifui/src/TestCaseMenuView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestCaseMenuView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,7 +17,7 @@
*/
// INCLUDE FILES
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
#include "TestCaseMenuView.h"
--- a/stifui/stifui/src/TestCaseOutputContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestCaseOutputContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -23,7 +23,7 @@
#include "AppUIAppUi.h"
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <badesca.h> // CDesCArray
#include <eikclbd.h> // CColumnListBoxData
#include <aknnotewrappers.h>
--- a/stifui/stifui/src/TestCaseOutputView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestCaseOutputView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <eikmenub.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <akntitle.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
--- a/stifui/stifui/src/TestSetBaseMenuView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestSetBaseMenuView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,7 +17,7 @@
*/
// INCLUDE FILES
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <aknlists.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
--- a/stifui/stifui/src/TestSetInsertMenuContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestSetInsertMenuContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <aknnotewrappers.h>
#include <eikclbd.h> // CColumnListBoxData
--- a/stifui/stifui/src/TestSetInsertMenuView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestSetInsertMenuView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <eikmenub.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <aknlistquerydialog.h>
#include <aknnotewrappers.h>
#include <barsread.h> //TResourceReader
--- a/stifui/stifui/src/TestSetMenuContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestSetMenuContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <aknnotewrappers.h>
#include <eikclbd.h> // CColumnListBoxData
--- a/stifui/stifui/src/TestSetMenuView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestSetMenuView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,7 +17,7 @@
// INCLUDE FILES
#include <eikmenub.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <aknlistquerydialog.h>
#include <aknnotewrappers.h>
#include <barsread.h> //TResourceReader
--- a/stifui/stifui/src/TestSetStartedCasesContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestSetStartedCasesContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <aknlists.h> // ListBox
-#include <akniconarray.h> // CAknIconArray
+#include <AknIconArray.h> // CAknIconArray
#include <badesca.h> // CDesCArray
#include <eikclbd.h> // CColumnListBoxData
#include <aknnotewrappers.h>
--- a/stifui/stifui/src/TestSetStartedCasesView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/TestSetStartedCasesView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <eikmenub.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <barsread.h> //TResourceReader
#include <Stifui.rsg>
--- a/stifui/stifui/src/Testmodulesmenuview.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/Testmodulesmenuview.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -17,7 +17,7 @@
*/
// INCLUDE FILES
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <Stifui.rsg>
#include <barsread.h> //TResourceReader
--- a/stifui/stifui/src/View.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/stifui/src/View.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -16,7 +16,7 @@
*/
// INCLUDE FILES
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include <Stifui.rsg>
#include "AppUIAppUi.h"
#include "View.h"
--- a/stifui/uitestserverstarter/inc/UITestServerStarterAppUi.h Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/uitestserverstarter/inc/UITestServerStarterAppUi.h Fri Feb 19 22:51:38 2010 +0200
@@ -20,7 +20,7 @@
#define UITESTSERVERSTARTERAPPUI_H_
// INCLUDES
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
// CONSTANTS
// None
--- a/stifui/uitestserverstarter/inc/UITestServerStarterDocument.h Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/uitestserverstarter/inc/UITestServerStarterDocument.h Fri Feb 19 22:51:38 2010 +0200
@@ -20,7 +20,7 @@
#define UITESTSERVERSTARTERDOCUMENT_H_
// INCLUDES
-#include <akndoc.h>
+#include <AknDoc.h>
// CONSTANTS
// None
--- a/stifui/uitestserverstarter/src/UITestServerStarterAppContainer.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/uitestserverstarter/src/UITestServerStarterAppContainer.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -21,7 +21,7 @@
#include <AknsDrawUtils.h>
#include <AknsBasicBackgroundControlContext.h>
#include <AknDef.h>
-#include <aknutils.h>
+#include <AknUtils.h>
// EXTERNAL DATA STRUCTURES
// None
--- a/stifui/uitestserverstarter/src/UITestServerStarterAppUi.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/uitestserverstarter/src/UITestServerStarterAppUi.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -20,7 +20,7 @@
#include <avkon.hrh>
#include <aknmessagequerydialog.h>
#include <aknnotewrappers.h>
-#include <stringloader.h>
+#include <StringLoader.h>
#include <f32file.h>
#include <s32file.h>
#include <hlplch.h>
--- a/stifui/uitestserverstarter/src/UITestServerStarterAppView.cpp Tue Feb 02 00:17:27 2010 +0200
+++ b/stifui/uitestserverstarter/src/UITestServerStarterAppView.cpp Fri Feb 19 22:51:38 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <coemain.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
#include "UITestServerStarterAppView.h"
#include "UITestServerStarterApplication.h"
#include "UITestServerStarterAppContainer.h"