--- a/ncdengine/provider/deviceinteraction/inc/ncdinstallationserviceimpl.h Fri Jun 11 13:45:18 2010 +0300
+++ b/ncdengine/provider/deviceinteraction/inc/ncdinstallationserviceimpl.h Wed Jun 23 18:20:02 2010 +0300
@@ -27,7 +27,9 @@
#include <apgcli.h>
#include <centralrepository.h>
#include <SWInstApi.h>
-#include <WidgetRegistryClient.h>
+//#include <WidgetRegistryClient.h>
+#include <usif/sif/sif.h>
+#include <usif/scr/scr.h>
#include "ncdinstallationservice.h"
#include "ncditempurpose.h"
@@ -36,25 +38,6 @@
#include "ncdwidgetregistrydata.h"
-/**
- * New Java registry API was introduced in 3.2. We start using it
- * from 5.0 onwards because it seems that some 3.2 devices don't support
- * it entirely
- */
-
- /* HLa - temporary java remove
-#if defined( __SERIES60_30__ ) || defined( __SERIES60_31__ ) || defined ( __S60_32__ )
- #define USE_OLD_JAVA_API
- class MJavaRegistrySuiteEntry;
- class MJavaRegistry;
-#else
- namespace Java
- {
- class CJavaRegistry;
- }
-#endif
-*/
-
class CDocumentHandler;
class MNcdInstallationServiceObserver;
@@ -386,23 +369,6 @@
*/
TBool IsRomApplication( const TUid& aUid ) const;
-
- /**
- * Gets the UID of the latest installed midlet by using the
- * Java installer's P&S key
- *
- * @param aJavaRegistry Java registry
- * @return Midlet UID
- */
-
- /* HLa - temporary java remove
-#ifdef USE_OLD_JAVA_API
- TUid LatestMidletUidL( MJavaRegistry& aJavaRegistry ) const;
-#else
- TUid LatestMidletUidL( Java::CJavaRegistry& aJavaRegistry ) const;
-#endif
- */
-
static TBool MatchJava( const TDesC& aMime );
TUid InstalledMidletUidL();
@@ -459,11 +425,6 @@
// When installing java with JAD, the JAD path is stored here
HBufC* iJadFileName;
-#ifdef USE_OLD_JAVA_API
- // For comparing installed midlet uids to find out the uid for the newly
- // installed java app.
- RArray<TUid> iMIDletUids;
-#endif
// Theme handling
// Server session
@@ -496,9 +457,10 @@
SwiUI::TServerRequest iCancelCode;
- RWidgetRegistryClientSession iWidgetRegistry;
+ //RWidgetRegistryClientSession iWidgetRegistry;
+ Usif::RSoftwareComponentRegistry iScrSession;
- RWidgetInfoArray iInstalledWidgets;
+ //RWidgetInfoArray iInstalledWidgets;
RPointerArray<CExtendedWidgetInfo> iInstalledWidgetsInfos;
};