--- a/applicationmanagement/omascomoadapter/src/omascomoadapterdb.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/applicationmanagement/omascomoadapter/src/omascomoadapterdb.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -272,7 +272,7 @@
dbitem->iRetryCount = view.ColInt(7);
- aItemArray.Append(dbitem);
+ aItemArray.AppendL(dbitem);
view.NextL();
}
--- a/applicationmanagement/server/inc/amview.h Fri Sep 17 08:27:39 2010 +0300
+++ b/applicationmanagement/server/inc/amview.h Mon Oct 04 00:06:35 2010 +0300
@@ -29,8 +29,16 @@
public:
AMView();
~AMView();
-
+signals :
+ /**
+ * applicationReady() - To emit the application ready signal for matti tool.
+ */
+ void applicationReady();
+public:
//Handles the incoming events
bool eventFilter(QObject *object, QEvent *event);
+
+private:
+ TBool Initilized;
};
#endif /* AMVIEW_H_ */
--- a/applicationmanagement/server/server.pro Fri Sep 17 08:27:39 2010 +0300
+++ b/applicationmanagement/server/server.pro Mon Oct 04 00:06:35 2010 +0300
@@ -68,7 +68,6 @@
-lfeatmgr \
-lpolicyengine \
-lflogger \
- -lapengine \
-lcommdb \
-lapgrfx \
-lws32 \
--- a/applicationmanagement/server/src/AMDownloadStore.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/applicationmanagement/server/src/AMDownloadStore.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -52,7 +52,7 @@
void CAMDownloadStore::AddDownloadL(CDeploymentComponent *aComponent)
{
CAMDwnldQTWrap *download = CAMDwnldQTWrap::NewL(iObserver, aComponent);
- iDwnldStore.Append(download);
+ iDwnldStore.AppendL(download);
StartDownload();
}
--- a/applicationmanagement/server/src/AMDownloaddb.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/applicationmanagement/server/src/AMDownloaddb.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -295,7 +295,7 @@
dbitem->iTargetURI= (view.ColDes8(4)).AllocL();
dbitem->iapid = view.ColInt(5);
- aItemArray.Append(dbitem);
+ aItemArray.AppendL(dbitem);
CleanupStack::Pop(dbitem);
view.NextL();
}
--- a/applicationmanagement/server/src/AMPreInstallApp.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/applicationmanagement/server/src/AMPreInstallApp.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -193,7 +193,7 @@
pkgDes.AppendNum(version.iMinor);
params->iVersion.Copy(pkgDes);
- iPreInstalledAppParams.Append(params);
+ iPreInstalledAppParams.AppendL(params);
RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: Installed App UID is : '0x%X'",appUid);
RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: Installed App Name is: %S",&(sisRegistry->Name()));
--- a/applicationmanagement/server/src/amstorage.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/applicationmanagement/server/src/amstorage.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -400,8 +400,17 @@
if (idx == KErrNotFound)
{
RDEBUG_2( "CDeliveryComponentStorage::NewComponentL - TCertInfoPckg NOT found 0x%X", reinterpret_cast<TUint>( p ) );
- iCertificates.Append(p);
- idx = iCertificates.Count() - 1;
+ TRAPD(err,iCertificates.AppendL(p));
+ if(err != KErrNone)
+ {
+ delete p;
+ p = NULL;
+ User::Leave( err );
+ }
+ else
+ {
+ idx = iCertificates.Count() - 1;
+ }
}
else
{
@@ -423,8 +432,8 @@
newc->SetState(aState);
newc->SetStatusNode(EIdle);
UpdateL( *newc);
- iComponents.Append(newc);
- iComponentIds.Append(newc->InternalId() );
+ iComponents.AppendL(newc);
+ iComponentIds.AppendL(newc->InternalId() );
RDEBUG_2( "CDeliveryComponentStorage::NewComponentL -Internal ID is %d, ", newc->InternalId() );
PersistStateL();
CleanupStack::Pop(newc);
@@ -501,7 +510,7 @@
TInt err(iRepository->Get(aInternalId, buf) );
User::LeaveIfError(err) ;
resp = LoadComponentL(aInternalId, buf) ;
- iComponents.Append(resp);
+ iComponents.AppendL(resp);
}
if (resp == NULL)
{
--- a/applicationmanagement/server/src/amview.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/applicationmanagement/server/src/amview.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -24,7 +24,7 @@
// ------------------------------------------------------------------------------------------------
AMView::AMView()
{
-
+ Initilized = EFalse;
}
// ------------------------------------------------------------------------------------------------
// AMView::~AMView()
@@ -38,6 +38,12 @@
// ------------------------------------------------------------------------------------------------
bool AMView::eventFilter(QObject *object, QEvent *event)
{
+ if( Initilized == EFalse )
+ {
+ emit applicationReady();
+ Initilized = ETrue;
+ }
+
switch (event->type())
{
case QEvent::ApplicationActivate:
--- a/clientprovisioning/cpqtsp/src/CWPSaver.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/clientprovisioning/cpqtsp/src/CWPSaver.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -3,7 +3,7 @@
* Name : CWPSaver.cpp
* Part of : Provisioning / ProvisioningBC
* Description : Helper class for saving Provisioning settings. Provides a progress note.
-* Version : %version: 2 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 3 % << Don't touch! Updated by Synergy at check-out.
*
* Copyright © 2002-2006 Nokia. All rights reserved.
* This material, including documentation and any related computer
@@ -54,7 +54,7 @@
// Assume ownership of this.
CleanupStack::PushL( this );
iProgress = new HbProgressDialog(HbProgressDialog::WaitDialog);
- iProgress->setText(hbTrId("txt_device_update_setlabel_saving_settings"));
+ iProgress->setText(hbTrId("txt_deviceupdate_dblist_config_set_val_saving"));
iProgress->clearActions();
iProgress->show();
--- a/clientprovisioning/cpqtsp/src/CpMessage.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/clientprovisioning/cpqtsp/src/CpMessage.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -64,6 +64,11 @@
HbMessageBox *box = new HbMessageBox(hbTrId("txt_device_update_info_settings_are_already_saved"),HbMessageBox::MessageTypeQuestion);
box->setAttribute(Qt::WA_DeleteOnClose);
box->setTimeout(HbPopup::NoTimeout);
+ box->clearActions();
+ HbAction * action1 = new HbAction(hbTrId("txt_common_button_save"));
+ HbAction * action2 = new HbAction(hbTrId("txt_common_button_cancel"));
+ box->addAction(action1);
+ box->addAction(action2);
box->open(this,SLOT(saveSettingDialogClosed(HbAction*)));
}
--- a/clientprovisioning/cpqtsp/src/CpQtSpMainWindow.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/clientprovisioning/cpqtsp/src/CpQtSpMainWindow.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -92,7 +92,7 @@
cont->setLayout(layout);
area->setContentWidget(cont);
HbToolBar* toolBar = iView->toolBar();
- HbAction* saveAction = new HbAction(hbTrId("txt_device_update_button_save"));
+ HbAction* saveAction = new HbAction(hbTrId("txt_common_button_save"));
connect(saveAction, SIGNAL(triggered()), iView, SLOT(saveProvisoningMessage()));
HbAction* DeleteAction = new HbAction(hbTrId("txt_device_update_menu_delete"));
connect(DeleteAction, SIGNAL(triggered()), iView, SLOT(deleteMessage()));
--- a/deviceupdatesui/deviceupdates/deviceupdates.pro Fri Sep 17 08:27:39 2010 +0300
+++ b/deviceupdatesui/deviceupdates/deviceupdates.pro Mon Oct 04 00:06:35 2010 +0300
@@ -25,6 +25,9 @@
TARGET.UID2 = 0x100039CE
TARGET.UID3 = 0x101F6DE5
TARGET.CAPABILITY = CAP_APPLICATION
+
+RSS_RULES += "hidden = KAppIsHidden;"
+
LIBS += -lCommonEngine\
-lcentralrepository\
-lfeatmgr\
--- a/deviceupdatesui/deviceupdates/inc/dmfotaview.h Fri Sep 17 08:27:39 2010 +0300
+++ b/deviceupdatesui/deviceupdates/inc/dmfotaview.h Mon Oct 04 00:06:35 2010 +0300
@@ -56,10 +56,12 @@
//HbDialog* createDialog() const;
void displayNoteAndDisableButtons();
void enableButtons();
-private:
- void FormatList(QString val, QString str);
- RFotaEngineSession& FotaEngineL();
- void fotaSupportEnabled();
+
+signals :
+ /**
+ * applicationReady() - To emit the application ready signal for matti tool.
+ */
+ void applicationReady();
public slots :
void OnHelp();
void OnExit();
@@ -71,6 +73,10 @@
public:
void UpdateDMUI(TBool aVal);
private:
+ void FormatList(QString val, QString str);
+ RFotaEngineSession& FotaEngineL();
+ void fotaSupportEnabled();
+private:
HbMainWindow* mMainWindow;
HbView* fotaPortraitView;
HbView* fotaLandscapeView;
--- a/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -599,7 +599,7 @@
nwInfov1 = nwInfov1Pckg();
NetworkBand(nwInfov1.iBandInfo, str);
item = new QStandardItem();
- val = hbTrId("txt_device_update_dblist_gsm_bands");
+ val = hbTrId("txt_deviceupdate_dblist_network_band_supported");
liststr.clear();
liststr << val;
liststr << str;
@@ -631,7 +631,7 @@
if(nwInfov8.iHsupaAvailableIndicator) packetsrvc =3;
}
liststr.clear();
- val = hbTrId("txt_device_update_dblist_wcdma_uldl_data_rates");
+ val = hbTrId("txt_deviceupdate_dblist_data_service_supported");
liststr << val;
item = new QStandardItem();
PacketService(packetsrvc, str);
@@ -643,7 +643,7 @@
liststr.clear();
item = new QStandardItem();
- val = hbTrId("txt_device_update_dblist_gsm_cipherings");
+ val = hbTrId("txt_deviceupdate_dblist_network_security_level");
liststr << val;
imobPhone.GetNetworkSecurityLevel(status,idispSecurity);
User::WaitForRequest( status );
@@ -851,23 +851,23 @@
switch (val)
{
case (0):
- string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l1");
+ string = hbTrId("txt_deviceupdate_dblist_data_srvce_suppo_val_GPRS");
break;
case (1):
- string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l2");
+ string = hbTrId("txt_deviceupdate_dblist_data_srvce_suppo_val_HSDPA");
break;
case (2):
- string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l3");
+ string = hbTrId("txt_deviceupdate_dblist_data_srvce_suppo_val_HSUPA");
break;
case (3):
- string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l4");
+ string = hbTrId("txt_deviceupdate_dblist_data_srvce_suppo_val_EGPRS");
break;
case (4):
- string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l4");
+ string = hbTrId("txt_deviceupdate_dblist_ntwrk_secu_lvl_val_CDMA");
break;
case (5):
default :
- string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l5");
+ string = hbTrId("txt_deviceupdate_dblist_data_srvce_suppo_val_Unknow");
break;
}
qDebug("OMADM servers view DmAdvancedView::PacketService <<");
@@ -880,17 +880,17 @@
switch (val)
{
case (RMobilePhone::ECipheringGSM):
- string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l2");
+ string = hbTrId("txt_deviceupdate_dblist_ntwrk_secu_lvl_val_GSM");
break;
case (RMobilePhone::ECipheringWCDMA):
- string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l3");
+ string = hbTrId("txt_deviceupdate_dblist_ntwrk_secu_lvl_val_WCDMA");
break;
case (RMobilePhone::ECipheringCDMA):
- string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l4");
+ string = hbTrId("txt_deviceupdate_dblist_ntwrk_secu_lvl_val_CDMA");
break;
case (RMobilePhone::ECipheringOff):
default :
- string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l1");
+ string = hbTrId("txt_deviceupdate_dblist_ntwrk_secu_lvl_val_none");
break;
}
qDebug("OMADM servers view DmAdvancedView::NetworkCiphering <<");
@@ -902,35 +902,35 @@
switch (val)
{
case (RMobilePhone::E800BandA):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l2");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__800BA");
break;
case (RMobilePhone::E800BandB):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l3");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__800BB");
break;
case (RMobilePhone::E800BandC):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l4");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__800BC");
break;
case (RMobilePhone::E1900BandA):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l5");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__1900BA");
break;
case (RMobilePhone::E1900BandB):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l6");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__1900BB");
break;
case (RMobilePhone::E1900BandC):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l7");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__1900BC");
break;
case (RMobilePhone::E1900BandD):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l8");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__1900BD");
break;
case (RMobilePhone::E1900BandE):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l9");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__1900BE");
break;
case (RMobilePhone::E1900BandF):
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l10");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val__1900BF");
break;
case (RMobilePhone::EBandUnknown):
default :
- string = hbTrId("txt_device_update_dblist_gsm_bands_val_l1");
+ string = hbTrId("txt_deviceupdate_dblist_netwrk_bnd_spp_val_unknown");
break;
}
qDebug("OMADM servers view DmAdvancedView::NetworkBand <<");
--- a/deviceupdatesui/deviceupdates/src/dmfotaview.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/dmfotaview.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -360,6 +360,7 @@
iMoniter = CDeviceUpdateMoniter::NewL(this);
//iMoniter->StartMoniter();
+ emit applicationReady();
qDebug("DMFotaView::addFotaView <<");
return ETrue;
}
--- a/omacpadapters/accesspointadapter/Src/CWPAPNapdef.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/omacpadapters/accesspointadapter/Src/CWPAPNapdef.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -1604,7 +1604,7 @@
if ( eap->iEAPSettings->iCertificatesPresent )
{
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL Certificate was present." ) );
- eap->iEAPSettings->iCertificates.Append( eap->iCertificate );
+ eap->iEAPSettings->iCertificates.AppendL( eap->iCertificate );
}
// Save EAP list
--- a/omadmadapters/connmoadapter/src/AddBuffer.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/omadmadapters/connmoadapter/src/AddBuffer.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -279,8 +279,22 @@
first = EFalse;
retval = 0;
}
- aGroup->Append(iBuffer[i]);
- iCache.Append(iBuffer[i]);
+ TInt err = KErrNone;
+ TRAP(err,aGroup->AppendL(iBuffer[i]));
+ if(err != KErrNone)
+ {
+ retval = err;
+ break;
+ }
+ TRAP(err,iCache.AppendL(iBuffer[i]));
+ if(err != KErrNone)
+ {
+ TInt indx = aGroup->Find(iBuffer[i]);
+ if(indx != KErrNotFound)
+ aGroup->Remove(indx);
+ retval = err;
+ break;
+ }
retval++;
}
}
--- a/omadmadapters/nsmldminternet/src/NSmlWLanAdapter.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/omadmadapters/nsmldminternet/src/NSmlWLanAdapter.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -1352,7 +1352,16 @@
"CNSmlWLanAdapter::AddLeafObject - Certificate buffer does not exist. Create it.");
// The certificate buffer does not exist. Create a new one
EapCertificateEntry *entry = new (ELeave) EapCertificateEntry;
- iEAPBuffer[eapIndex]->iEAPSettings->iCertificates.Append(entry);
+ TRAPD(err, iEAPBuffer[eapIndex]->iEAPSettings->iCertificates.AppendL(entry));
+ if(err != KErrNone)
+ {
+ delete entry;
+ DBG_ARGS(_S16(
+ "CNSmlWLanAdapter::AddLeafObjectL - ErrorCode <%D>"),
+ err);
+ iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
+ return;
+ }
iEAPBuffer[eapIndex]->iEAPSettings->iCertificatesPresent = ETrue;
certIndex
@@ -3278,7 +3287,17 @@
delete eapLuidBuf;
EapCertificateEntry *entry = new (ELeave) EapCertificateEntry;
- iEAPBuffer[index]->iEAPSettings->iCertificates.Append(entry);
+ TRAPD(err, iEAPBuffer[index]->iEAPSettings->iCertificates.AppendL(entry));
+ if(err != KErrNone)
+ {
+ delete entry;
+ DBG_ARGS(_S16(
+ "CNSmlWLanAdapter::AddLeafObjectL - ErrorCode <%D>"),
+ err);
+ iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
+ return;
+ }
+
iEAPBuffer[index]->iEAPSettings->iCertificatesPresent = ETrue;
iEAPBuffer[index]->iStatusRefArray.AppendL(aStatusRef);
--- a/omadmadapters/streamingadapter/src/nsmlstreamingadapter.cpp Fri Sep 17 08:27:39 2010 +0300
+++ b/omadmadapters/streamingadapter/src/nsmlstreamingadapter.cpp Mon Oct 04 00:06:35 2010 +0300
@@ -683,6 +683,7 @@
{
DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in IAPIdFromURIL %d"), aNap);
iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
+ CleanupStack::PopAndDestroy(); // iapMatch
return;
}