1.1 --- a/epoc32/include/mw/mtsr.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/mtsr.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -11,8 +11,13 @@
    1.16  // Contributors:
    1.17  //
    1.18  // Description:
    1.19 +// MTSR.H
    1.20  //
    1.21 -
    1.22 +/**
    1.23 + @file
    1.24 + @publishedAll
    1.25 + @released
    1.26 +*/
    1.27  #ifndef __MTSR_H__
    1.28  #define __MTSR_H__
    1.29  
    1.30 @@ -21,6 +26,9 @@
    1.31  #include <msvstd.h>
    1.32  #include <msvreg.h>
    1.33  #include <tnonoperationmtmdata.h>
    1.34 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS  
    1.35 +#include "cinstalledmtmgroup.h"
    1.36 +#endif
    1.37  
    1.38  // forward declarations
    1.39  class RWriteStream;
    1.40 @@ -30,6 +38,11 @@
    1.41  class CInstalledMtmGroup;
    1.42  class CMsvServerEntry;
    1.43  class TMsvSystemProgress;
    1.44 +class CInstalledMtmGroupArray;
    1.45 +
    1.46 +#if (defined SYMBIAN_USER_PROMPT_SERVICE)
    1.47 +const TUint KUIDMsgClientThreadInfo = 0x10283090;
    1.48 +#endif
    1.49  
    1.50  class CBaseServerMtm : public CActive
    1.51  /** Base class for Server-side MTM components. Server-side MTMs provide all message 
    1.52 @@ -365,6 +378,10 @@
    1.53  	virtual void MoveWithinServiceL(const CMsvEntrySelection& aSelection,TMsvId aDestination, TRequestStatus& aStatus)=0;
    1.54  
    1.55  	IMPORT_C TInt SystemProgress(TMsvSystemProgress& aOutSysProg);
    1.56 +#if (defined SYMBIAN_USER_PROMPT_SERVICE)	
    1.57 +	TInt ClientThreadInfo(TThreadId aClientInfo, TBool aCapabilityCheck);
    1.58 +#endif
    1.59 +
    1.60  	TInt GetNonOperationMtmData(TNonOperationMtmDataType& aMtmDataType, TPtrC8& aResultBuffer);
    1.61  
    1.62  protected:
    1.63 @@ -428,19 +445,6 @@
    1.64  	CBaseServerMtm* NewMtmL(const RLibrary& aLib, CMsvServerEntry* aServerEntry, CRegisteredMtmDll& aReg) const;
    1.65  	};
    1.66  
    1.67 -
    1.68 -class CInstalledMtmGroupArray : public CArrayPtrFlat<CInstalledMtmGroup>
    1.69 -/**
    1.70 -@internalComponent
    1.71 -@released
    1.72 -*/
    1.73 -	{
    1.74 -public:
    1.75 -	CInstalledMtmGroupArray();
    1.76 -	~CInstalledMtmGroupArray();
    1.77 -	void AddInstalledMtmGroupL(CInstalledMtmGroup* aInstalledMtmGroup);
    1.78 -	};
    1.79 -
    1.80  //**********************************
    1.81  // CMsvMtmCache
    1.82  //**********************************
    1.83 @@ -497,8 +501,9 @@
    1.84  	CMtmGroupData *LoadResFileL(const TDesC& aFullName, TUid &aUid);	
    1.85  private:
    1.86  	RFs& iFs;
    1.87 -	CInstalledMtmGroupArray iInstalledMtmGroupArray;
    1.88 +	CInstalledMtmGroupArray* iInstalledMtmGroupArray;
    1.89  	CServerMtmDllRegistry& iServerMtmDllRegistry;
    1.90 +	TPath iPathName;
    1.91  	};
    1.92  
    1.93  #endif	// __MTSR_H__