--- a/installationservices/swi/inc/swi/siscontroller.h Tue Aug 31 15:21:33 2010 +0300
+++ b/installationservices/swi/inc/swi/siscontroller.h Wed Sep 01 12:22:02 2010 +0100
@@ -33,7 +33,6 @@
#include "sissignaturecertificatechain.h"
#include "sispackagetrust.h"
#include <hash.h>
-#include "nativecomponentinfo.h"
namespace Swi
{
@@ -42,7 +41,7 @@
class CCertChainConstraints;
namespace Sis
-{
+ {
class CInfo;
class CPrerequisites;
@@ -321,27 +320,7 @@
*/
inline void SetHasExecutable(TBool aHasExe);
- /** Returns a flag
- @return iIsDriveSelectionRequired TBool flag
- */
- inline TBool CController::DriveSelectionRequired() const;
-
- /** Sets the status of flag
- @param aIsDriveSelectionRequired TBool
- */
- inline void CController::SetDriveSelectionRequired(TBool aIsDriveSelectionRequired);
-
- /** Returns a pointer array of CNativeApplicationInfo
- @return RPointerArray iApplicationInfo
- */
- inline RCPointerArray<CNativeComponentInfo::CNativeApplicationInfo>& CController::GetApplicationInfo();
-
- /** Adds the application Info to the array of CNativeApplicationInfo
- @param aApplicationInfo The info for a native application
- */
- inline void CController::AddApplicationInfoL(const CNativeComponentInfo::CNativeApplicationInfo* aApplicationInfo);
-
- #endif
+ #endif
private:
@@ -393,8 +372,6 @@
TBool iHasExe; ///< Indicates Whether the component has an exe or not
- TBool iIsDriveSelectionRequired; ///< Indicates Whether drive selection is required or not.
-
mutable TSisTrustStatus* iTrustStatus; ///< The install trust status
mutable RArray<TInt> iCertChainIndices; ///< Contains the indexes of the chains
@@ -402,7 +379,6 @@
mutable TInt iRemoveWithLastDependent; ///< Whether uninstall with last dependent
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- RCPointerArray<CNativeComponentInfo::CNativeApplicationInfo> iApplicationInfo; ///< Pointer Array of application info objects CNativeApplicationInfo.
TCapabilitySet iUserGrantableCapabilities;
#endif
@@ -505,30 +481,9 @@
{
iHasExe = aHasExe;
}
-
-inline TBool CController::DriveSelectionRequired() const
- {
- return iIsDriveSelectionRequired;
- }
-
-inline void CController::SetDriveSelectionRequired(TBool aIsDriveSelectionRequired)
- {
- iIsDriveSelectionRequired = aIsDriveSelectionRequired;
- }
-
-inline RCPointerArray<CNativeComponentInfo::CNativeApplicationInfo>& CController::GetApplicationInfo()
- {
- return iApplicationInfo;
- }
-
-inline void CController::AddApplicationInfoL(const CNativeComponentInfo::CNativeApplicationInfo* aApplicationInfo)
- {
- iApplicationInfo.AppendL(aApplicationInfo);
- }
-
#endif
-} // namespace Sis
+ } // namespace Sis
} // namespace Swi