Revision: 201023 RCL_3 PDK_3.0.1
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Mon, 21 Jun 2010 16:49:27 +0300
branchRCL_3
changeset 19 c00b160ac7eb
parent 17 3e3bd14de94e
child 21 e9b96e674847
Revision: 201023 Kit: 2010125
usbclasses/pictbridgeengine/src/dpsoperation.cpp
usbclasses/pictbridgeengine/src/dpsxmlparser.cpp
usbclasses/pictbridgeengine/src/pictbridge.cpp
usbengines/usbdevcon/src/crequestshandler.cpp
usbengines/usbremotepersonality/src/cremotepersonalityhandler.cpp
usbengines/usbwatcher/src/cusbpersonalitynotifier.cpp
usbuis/imageprintui/inc/capabilitymanager.h
usbuis/imageprintui/src/capabilitymanager.cpp
usbuis/imageprintui/src/requestmanager.cpp
usbuis/imageprintui/src/settingsitems.cpp
usbuis/usbui/USBClassChangeUIPlugin/src/USBClassChangeUIPluginModel.cpp
--- a/usbclasses/pictbridgeengine/src/dpsoperation.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbclasses/pictbridgeengine/src/dpsoperation.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -117,9 +117,15 @@
     // jobConfig    
     TInt count = iReqParam.iJobConfig.Count();
               
+    TInt ret = KErrNone;
+    
     elemsP[0].iElement = EDpsJobConfig;
     elemsP[0].iNum = count;
-    aElements.Append(elemsP[0]);
+    if ( (ret = aElements.Append(elemsP[0])) != KErrNone )
+        {
+        IF_DEBUG(Print(_L("*** append error")));
+        return ret;
+        }
     for (TInt i = 0; i < count; i++)
         {
         argsP[i].iElement = iReqParam.iJobConfig[i].iElement;
@@ -127,11 +133,14 @@
     	argsP[i].iContent.AppendNumUC(iReqParam.iJobConfig[i].iContent, EHex);
     	// we have to append the low bytes (0000)
     	argsP[i].iContent.Append(KDpsLowZero);
-    	aArgs.Append(argsP[i]);
+    	if ( (ret = aArgs.Append(argsP[i])) != KErrNone ) 
+    	    {
+    	    IF_DEBUG(Print(_L("*** append error")));
+    	    return ret;
+    	    }
     	IF_DEBUG(Print(_L("the element is %d"), argsP[i].iElement));
     	IF_DEBUG(Print(_L("the content is %S"), &(argsP[i].iContent)));
     	}    
-    	
     // printInfo
     for (TInt j = 0; j < imageCount; j++)
         {
@@ -141,7 +150,12 @@
     	argsP[count].iElement = EDpsArgFileID;
     	argsP[count].iContent.AppendNumFixedWidth(objectHandles[j], EHex, 
     	                                          KFullWordWidth);
-    	aArgs.Append(argsP[count]);
+    	if ( (ret = aArgs.Append(argsP[count])) != KErrNone )
+    	    {
+    	    IF_DEBUG(Print(_L("*** append error")));
+    	    return ret;
+    	    }
+    	
     
     	IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
     	IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
@@ -152,7 +166,11 @@
     	    {
     	    argsP[count].iElement = EDpsArgFileName;
     	    argsP[count].iContent.Copy(iReqParam.iPrintInfo[j].iFile);
-    	    aArgs.Append(argsP[count]);
+    	    if ( (ret = aArgs.Append(argsP[count])) != KErrNone)
+    	        {
+                IF_DEBUG(Print(_L("*** append error")));
+    	        return ret;
+    	        }
     	    
     	    IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
     	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
@@ -164,7 +182,11 @@
     	    {
             argsP[count].iElement = EDpsArgDate;
             argsP[count].iContent.Copy(iReqParam.iPrintInfo[j].iDate);
-            aArgs.Append(argsP[count]);
+            if ( (ret = aArgs.Append(argsP[count])) != KErrNone) 
+                {
+                IF_DEBUG(Print(_L("*** append error")));
+                return ret;
+                }
             IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
     	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
             k++; count++;
@@ -174,7 +196,11 @@
             argsP[count].iElement = EDpsArgCopies;
             argsP[count].iContent.AppendNumFixedWidthUC(
                 iReqParam.iPrintInfo[j].iCopies, EDecimal, KCopyFileWidth);
-            aArgs.Append(argsP[count]);
+            if ( (ret = aArgs.Append(argsP[count])) != KErrNone) 
+                {
+                IF_DEBUG(Print(_L("*** append error")));
+                return ret;
+                }
             IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
     	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
     	    k++; count++;
@@ -183,7 +209,11 @@
     	    {
             argsP[count].iElement = EDpsArgPrtPID;
             argsP[count].iContent.AppendNumUC(iReqParam.iPrintInfo[j].iPrtPID);
-            aArgs.Append(argsP[count]);
+            if ( (ret = aArgs.Append(argsP[count])) != KErrNone) 
+                {
+                IF_DEBUG(Print(_L("*** append error")));
+                return ret;
+                }
             IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
     	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
     	    k++; count++;
@@ -192,14 +222,22 @@
     	    {
             argsP[count].iElement = EDpsArgCopyID;
             argsP[count].iContent.AppendNumUC(iReqParam.iPrintInfo[j].iCopyID);
-            aArgs.Append(argsP[count]);
+            if ( (ret = aArgs.Append(argsP[count])) != KErrNone) 
+                {
+                IF_DEBUG(Print(_L("*** append error")));
+                return ret;
+                }
             IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
     	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
     	    k++; count++;
     	    }
         
     	elemsP[j + 1].iNum = k;
-    	aElements.Append(elemsP[j + 1]);    
+    	if ( (ret = aElements.Append(elemsP[j + 1])) != KErrNone) 
+    	    {
+            IF_DEBUG(Print(_L("*** append error")));
+    	    return ret;
+    	    }
     	}
     	        
     delete[] objectHandles;	
@@ -257,9 +295,13 @@
     arg.iElement = EDpsArgAbortStyle;
     arg.iContent.AppendNumUC(iReqParam.iAbortStyle, EHex);
     arg.iContent.Append(KDpsLowZero);
-    aArgs.Append(arg);
+    TInt ret = aArgs.Append(arg);
+    if (ret != KErrNone) 
+        {
+        IF_DEBUG(Print(_L("*** append error")));
+        }
     IF_DEBUG(Print(_L("<<<TDpsAbortJob::FillReqArgs")));                            
-    return KErrNone;
+    return ret;
     }
     
 // ---------------------------------------------------------------------------
@@ -276,12 +318,21 @@
     TDpsEle elems;
     elems.iElement = EDpsCapability;
     elems.iNum = 1;
-    aElements.Append(elems);
+    TInt ret = KErrNone;
+    if ( (ret = aElements.Append(elems)) != KErrNone)
+        {
+        IF_DEBUG(Print(_L("*** append error")));
+        return ret;
+        }
     
     // only one parameter
     TDpsArg argsP;
     argsP.iElement = iReqParam.iCap;
-    aArgs.Append(argsP);
+    if ( (ret = aArgs.Append(argsP)) != KErrNone)
+        {
+        IF_DEBUG(Print(_L("*** append error")));
+        return ret;
+        }
     if (EDpsArgPaperTypes == iReqParam.iCap || EDpsArgLayouts == iReqParam.iCap)
         {
         if (iReqParam.iAttribute != 0)
@@ -337,7 +388,8 @@
         {
         return KErrNoMemory;
         }
-    TInt count;     
+    TInt count;
+    TInt ret = KErrNone;     
     for (TInt i = 0; i < KConfigPrintService; i++)
         {
         switch (i)
@@ -354,14 +406,14 @@
                 argsP[i].iContent.AppendNumUC
                     (iReqParam.iDpsVersions[j].iMinor);    
                 }
-            aArgs.Append(argsP[i]);
+            ret = aArgs.Append(argsP[i]);
         break;    
         
         case EDpsArgVendorName: // vender name
             
             argsP[i].iElement = EDpsArgVendorName;
             argsP[i].iContent.Append(iReqParam.iVendorName);
-            aArgs.Append(argsP[i]);
+            ret = aArgs.Append(argsP[i]);
                         
         break;  
         
@@ -373,7 +425,7 @@
                 argsP[i].iContent.AppendNumUC(iReqParam.iVendorVersion.iMajor);
                 argsP[i].iContent.Append(_L("."));    
                 argsP[i].iContent.AppendNumUC(iReqParam.iVendorVersion.iMinor);
-                aArgs.Append(argsP[i]);        
+                ret = aArgs.Append(argsP[i]);        
                 }
             
         break;
@@ -381,7 +433,7 @@
         case EDpsArgProductName: // produce name
             argsP[i].iElement = EDpsArgProductName;
             argsP[i].iContent.Append(iReqParam.iProductName);
-            aArgs.Append(argsP[i]);
+            ret = aArgs.Append(argsP[i]);
         break;
         
         case EDpsArgSerialNo: // serialNo (optional)
@@ -389,7 +441,7 @@
                 {
                 argsP[i].iElement = EDpsArgSerialNo;
                 argsP[i].iContent.Append(iReqParam.iSerialNo);    
-                aArgs.Append(argsP[i]);
+                ret = aArgs.Append(argsP[i]);
                 }
             
         break;
@@ -401,9 +453,15 @@
             }
         
         }
+    
+    if (ret != KErrNone) 
+        {
+        IF_DEBUG(Print( _L("***TDpsConfigPrintService::FillReqArgs append error = %d"), ret));
+        }
+    
     delete[] argsP;
     IF_DEBUG(Print(_L("<<<TDpsConfigPrintService::FillReqArgs")));    
-    return KErrNone;    
+    return ret;    
     }
 
 // ---------------------------------------------------------------------------
@@ -419,6 +477,8 @@
     IF_DEBUG(Print(_L(">>>TDpsGetCapability::FillRepArgs")));    
     CDpsXmlParser* XmlPar = aTrader->Parser();
     
+    TInt ret = KErrNone;
+    
     if (aArgs.Count())
         {
         if (EDpsArgPaperTypes == aArgs[0].iElement || 
@@ -428,12 +488,18 @@
                 {
                 TDpsAttribute attrib;
 		        XmlPar->GetAttribute(attrib);
-		        iRepParam.iContent.Append(attrib);            
+		        ret = iRepParam.iContent.Append(attrib);            
                 }
             else
                 {
-                iRepParam.iContent.Append(0);
-                }    
+                ret = iRepParam.iContent.Append(0);
+                }
+            
+            if (ret != KErrNone)
+                {
+                IF_DEBUG(Print(_L("*** append error")));
+                return ret;
+                }
             }
         TUint32 value;
         TLex8 converter;
@@ -466,16 +532,21 @@
                 TInt major = value >> KShiftLength;
                 paperType.iMajor = (TDpsPaperTypeMajor)major;
                 paperType.iMinor = (TDpsPaperTypeMinor)(value & KDpsMinorMask);
-                iRepParam.iPaperType.Append(paperType);
+                ret = iRepParam.iPaperType.Append(paperType);
                 }
             else
                 {
                 // remove the extra zeros
                 value = value >> KShiftLength; 
-                iRepParam.iContent.Append(value);
+                ret = iRepParam.iContent.Append(value);
                 IF_DEBUG(Print(_L("the value is %x"), value));
                 }
             
+            if (ret != KErrNone) 
+                {
+                IF_DEBUG(Print(_L("*** append error")));
+                return ret;
+                }
             }
         iRepParam.iCap = aArgs[0].iElement;
            
@@ -543,7 +614,12 @@
                         {
                         return error;
                         }
-                    iRepParam.iDpsVersions.Append(version);            
+                    error = iRepParam.iDpsVersions.Append(version);
+                    if (error != KErrNone)
+                        {
+                        IF_DEBUG(Print(_L("*** append error")));
+                        return error;
+                        }
                     }
             break;
         
--- a/usbclasses/pictbridgeengine/src/dpsxmlparser.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbclasses/pictbridgeengine/src/dpsxmlparser.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -195,7 +195,7 @@
                     TDpsArg arg;
                     arg.iElement = (TDpsArgument)i;
                     arg.iContent.Copy(_L(""));
-                    iDpsArgs.Append(arg);
+                    iDpsArgs.AppendL(arg);
                     break;
                     }
                 }
--- a/usbclasses/pictbridgeengine/src/pictbridge.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbclasses/pictbridgeengine/src/pictbridge.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -293,7 +293,7 @@
         TDpsVersion version;
         version.iMajor = static_cast<TInt>(reader.ReadUint8());
         version.iMinor = static_cast<TInt>(reader.ReadUint8());
-        aConfig.iDpsVersions.Append(version); 
+        aConfig.iDpsVersions.AppendL(version); 
         }
     TPtrC vendorString = reader.ReadTPtrC(); 
     aConfig.iVendorName.Copy(vendorString);
--- a/usbengines/usbdevcon/src/crequestshandler.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbengines/usbdevcon/src/crequestshandler.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -62,7 +62,7 @@
         TUid uid(implementations[i]->ImplementationUid());
         CUsbCMHandler* handler = (reinterpret_cast<CUsbCMHandler*>(REComSession::CreateImplementationL
                                                                                                     (uid, _FOFF(CUsbCMHandler, iPrivateEComUID))));
-        iHandlers.Append(handler);
+        iHandlers.AppendL(handler);
         }
        
    implementations.Close(); // cleanup
--- a/usbengines/usbremotepersonality/src/cremotepersonalityhandler.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbengines/usbremotepersonality/src/cremotepersonalityhandler.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -361,7 +361,7 @@
         p.iIndex = KStringDescriptorsBase - i;
         
         // iPersonalities is a dynamic array, no error handling is needed on Append    
-        iPersonalities.Append(p);
+        iPersonalities.AppendL(p);
             
         FTRACE(FPrint(
           _L("[USBREMOTEPERSONALITY]\tCRemotePersonalityHandler::ReadPersonalities Personality id = %d Index = %d" ), iPersonalities[i].iId, iPersonalities[i].iIndex));
--- a/usbengines/usbwatcher/src/cusbpersonalitynotifier.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbengines/usbwatcher/src/cusbpersonalitynotifier.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -198,7 +198,11 @@
             return KErrGeneral;
             }
                 
-        iNotifierClient.Append(ptr);
+        if( (ret = iNotifierClient.Append(ptr)) != KErrNone)
+            {
+            LOG( "append error");
+            }
+        
         }
     
     return ret;
@@ -231,7 +235,10 @@
             return KErrGeneral;
             }
                 
-        iNotifierClient.Append( ptr );
+        if( ( ret = iNotifierClient.Append( ptr ) ) != KErrNone)
+            {
+            LOG( "append error");
+            }
         }
     
     return ret;
@@ -338,7 +345,11 @@
         //Remove all but the 1st
         TNotifierClient* ptr = iNotifierClient[0];
         iNotifierClient.Reset();
-        iNotifierClient.Append( ptr );
+        TInt ret = iNotifierClient.Append( ptr );
+        if (ret != KErrNone)
+            {
+            LOG("append error");
+            }
         }
     }
 
--- a/usbuis/imageprintui/inc/capabilitymanager.h	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbuis/imageprintui/inc/capabilitymanager.h	Mon Jun 21 16:49:27 2010 +0300
@@ -93,7 +93,7 @@
      * Return certain type list of Capabilities
      * @param aCapability the Capabilities type requested
      */
-    RArray<TUint>& GetCapabilities(TInt aCapability);
+    RArray<TUint>& GetCapabilitiesL(TInt aCapability);
     
     /**
     * Stores value choosed by user
--- a/usbuis/imageprintui/src/capabilitymanager.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbuis/imageprintui/src/capabilitymanager.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -277,7 +277,7 @@
 //  
 // ---------------------------------------------------------------------------
 //	
-RArray<TUint>& CCapabilityManager::GetCapabilities(TInt aCapabilities)
+RArray<TUint>& CCapabilityManager::GetCapabilitiesL(TInt aCapabilities)
     {
     FLOG(_L("[IMAGEPRINTUI]<<<CCapabilityManager.GetCapabilities"));
     iReturnArray.Reset();
@@ -287,21 +287,21 @@
 	    case EDpsArgQualities:
 	    	for(int i = 0; i < iCurrentQualities.Count(); i++ )
 	    		{
-	    		iReturnArray.Append(iCurrentQualities.operator[](i));
+	    		iReturnArray.AppendL(iCurrentQualities.operator[](i));
 	    		}
 	        break;
 	  
 	    case EDpsArgPaperSizes:
 	        for(int i = 0; i < iCurrentPaperSizes.Count(); i++ )
 	    		{
-	    		iReturnArray.Append(iCurrentPaperSizes.operator[](i));
+	    		iReturnArray.AppendL(iCurrentPaperSizes.operator[](i));
 	    		}	
 	        break;
 	        
 	    case EDpsArgLayouts:
 	    	for(int i = 0; i < iCurrentLayouts.Count(); i++ )
 	    		{
-	    		iReturnArray.Append(iCurrentLayouts.operator[](i));
+	    		iReturnArray.AppendL(iCurrentLayouts.operator[](i));
 	    		}
 			break;		
 	    default:
@@ -432,14 +432,14 @@
 		    	{
 		    	iIsCapabilityEmpty = ETrue;
 		    	FTRACE(FPrint(_L("[IMAGEPRINTUI]\t CCapabilityManager compareValue save quality is %x"), compareValue ));
-		    	iCurrentQualities.Append(compareValue);
+		    	iCurrentQualities.AppendL(compareValue);
 		    	}
 			}
 		}
 	if(!iIsCapabilityEmpty)	
 		{
 		FLOG(_L("[IMAGEPRINTUI]<<< CCapabilityManager: qualities add default value"));
-		iCurrentQualities.Append(EDpsPrintQualityDefault);
+		iCurrentQualities.AppendL(EDpsPrintQualityDefault);
 		}
 	FLOG(_L("[IMAGEPRINTUI]<<< CCapabilityManager: qualities stored, ask layout"));	
     iCurrentQualities.Sort();
@@ -474,14 +474,14 @@
 		    	{
 		    	iIsCapabilityEmpty = ETrue;
 		    	FTRACE(FPrint(_L("[IMAGEPRINTUI]\t CCapabilityManager compareValue save paper size is %x"), compareValue ));
-		    	iCurrentPaperSizes.Append(compareValue);
+		    	iCurrentPaperSizes.AppendL(compareValue);
 		    	}
 			}	
 		}
 	if(!iIsCapabilityEmpty)	
 		{
 		FLOG(_L("[IMAGEPRINTUI]<<< CCapabilityManager: paper size add default value"));
-		iCurrentPaperSizes.Append(EDpsPaperSizeDefault);
+		iCurrentPaperSizes.AppendL(EDpsPaperSizeDefault);
 		}
 	FLOG(_L("[IMAGEPRINTUI]<<< CCapabilityManager: paper sizes stored, ask quality"));
 	iCurrentPaperSizes.Sort();
@@ -496,6 +496,7 @@
 	{
 	FLOG(_L("[IMAGEPRINTUI]<<< CCapabilityManager: Store layouts"));
 	TInt countPrinter, countPhone;
+	TInt ret = KErrNone;
 	TUint compareValue;
 	countPrinter = aPrinterLayouts.Count();
 	countPhone = iPhoneSuppLayout.Count();	
@@ -513,7 +514,10 @@
 		    	{
 		    	iIsCapabilityEmpty = ETrue;
 		    	FTRACE(FPrint(_L("[IMAGEPRINTUI]\t CCapabilityManager compareValue save layout is %x"), compareValue ));
-		    	iCurrentLayouts.Append(compareValue);
+		    	if ( (ret = iCurrentLayouts.Append(compareValue)) != KErrNone)
+		    	    {
+		    	    FLOG(_L("[IMAGEPRINTUI]<<< CCapabilityManager: Store layouts *** append error"));
+		    	    }
 		    	}
 			}	
 		}
@@ -521,7 +525,11 @@
 	if(!iIsCapabilityEmpty)	
 		{
 		FLOG(_L("[IMAGEPRINTUI]<<< CCapabilityManager: layout add default value"));
-		iCurrentLayouts.Append(EDpsLayoutDefault);
+		ret = iCurrentLayouts.Append(EDpsLayoutDefault);
+		if (ret != KErrNone) 
+		    {
+            FLOG(_L("[IMAGEPRINTUI]<<< CCapabilityManager: Store layouts *** append error"));
+		    }
 		}
 	
 	iCurrentLayouts.Sort();	
@@ -575,7 +583,7 @@
 			// if fails add default value
 			iAppUi->NotifyError();
 			iCurrentQualities.Reset();
-			iCurrentQualities.Append(EDpsPrintQualityDefault);
+			iCurrentQualities.AppendL(EDpsPrintQualityDefault);
 			AskLayoutL();
 			}
 		
@@ -600,7 +608,7 @@
  			// if fails add default value;
  			iAppUi->NotifyError();
  			iCurrentPaperSizes.Reset();
- 			iCurrentPaperSizes.Append(EDpsPaperSizeDefault);
+ 			iCurrentPaperSizes.AppendL(EDpsPaperSizeDefault);
  			AskQualityL();
  			}
  		
@@ -624,7 +632,7 @@
  			//if fails add default value
  			iAppUi->NotifyError();
  			iCurrentLayouts.Reset();
- 			iCurrentLayouts.Append(EDpsLayoutDefault);
+ 			iCurrentLayouts.AppendL(EDpsLayoutDefault);
  			// complete even if not succesfull, UI must activate
  			iAppUi->CapabilitiesReady();
  			}
@@ -666,19 +674,19 @@
        
     for (TInt i = 0; i < qualityCount; i++)
     	{
-    	iPhoneSuppQuality.Append(reader.ReadUint16());
+    	iPhoneSuppQuality.AppendL(reader.ReadUint16());
     	}
     FLOG(_L("[IMAGEPRINTUI]>>> CImagePrintUi:CCapabilityManager, quality readed"));
     	
     for (TInt i = 0; i < papersizeCount; i++)
     	{
-       	iPhoneSuppPaperSize.Append(reader.ReadUint16());
+       	iPhoneSuppPaperSize.AppendL(reader.ReadUint16());
     	}		
     
     FLOG(_L("[IMAGEPRINTUI]>>> CImagePrintUi:CCapabilityManager, papersize readed"));
     for (TInt i = 0; i < layoutCount; i++)
     	{
-    	iPhoneSuppLayout.Append(reader.ReadUint16());
+    	iPhoneSuppLayout.AppendL(reader.ReadUint16());
     	}
     FLOG(_L("[IMAGEPRINTUI]>>> CImagePrintUi:CCapabilityManager, layout readed"));
     	
--- a/usbuis/imageprintui/src/requestmanager.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbuis/imageprintui/src/requestmanager.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -225,15 +225,15 @@
     
     req_quality.iElement = EDpsArgQuality;
     req_quality.iContent = quality;
-    iStart.iReqParam.iJobConfig.Append(req_quality);
+    iStart.iReqParam.iJobConfig.AppendL(req_quality);
     
     req_papersize.iElement = EDpsArgPaperSize;
     req_papersize.iContent = paperSize;
-    iStart.iReqParam.iJobConfig.Append(req_papersize);
+    iStart.iReqParam.iJobConfig.AppendL(req_papersize);
 
     req_layout.iElement = EDpsArgLayout;
     req_layout.iContent = layout;
-    iStart.iReqParam.iJobConfig.Append(req_layout);
+    iStart.iReqParam.iJobConfig.AppendL(req_layout);
               
    
     // retrieve  images
@@ -256,7 +256,7 @@
     		{
     		FLOG(_L("[IMAGEPRINTUI]<<< CRequestManager, Start job, file exist"));
     		helpTDpsPrintInfo[i].iFile.Copy(iImageArrayFlat->operator[](i));
-        	iStart.iReqParam.iPrintInfo.Append(helpTDpsPrintInfo[i]);
+        	iStart.iReqParam.iPrintInfo.AppendL(helpTDpsPrintInfo[i]);
     		}
     	}
     
--- a/usbuis/imageprintui/src/settingsitems.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbuis/imageprintui/src/settingsitems.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -245,7 +245,8 @@
     {
     HBufC* item; 
     FLOG(_L("[IMAGEPRINTUI]\t CSettingsItems::HandleEvent START"));
-    RArray<TUint> capabilityArray = iCapabilityManager->GetCapabilities(aCapability); 
+    RArray<TUint> capabilityArray = iCapabilityManager->GetCapabilitiesL(aCapability); 
+    
     TInt currentItemIndex(0);
     CDesCArrayFlat* items = new ( ELeave ) CDesCArrayFlat( KDefaultArrayValue );
     CleanupStack::PushL(items); 
--- a/usbuis/usbui/USBClassChangeUIPlugin/src/USBClassChangeUIPluginModel.cpp	Wed Jun 09 10:48:05 2010 +0300
+++ b/usbuis/usbui/USBClassChangeUIPlugin/src/USBClassChangeUIPluginModel.cpp	Mon Jun 21 16:49:27 2010 +0300
@@ -362,7 +362,7 @@
         {
         // Add empty value
         AddIconL (iPersonalityCount, aIconArray);
-        iUsbModeIndexes.Append(0);
+        iUsbModeIndexes.AppendL(0);
         aPopUpItems.AppendL(KNullDesC);
         aListBox.AppendL(KUSBUIEmptyString);
         aListBoxDefault.AppendL(KUSBUIEmptyString);
@@ -544,7 +544,11 @@
                     case EDriverLoadPartialSuccess:
                         {
                         // Drivers are loaded more or less successfully
-                        iDeviceIDs.Append(aEventInfo.iDeviceId);
+                        TInt ret = iDeviceIDs.Append(aEventInfo.iDeviceId);
+                        if (ret != KErrNone) 
+                            {
+                            FLOG( _L("[CUSBClassChangeUIPlugin]\t CUSBClassChangeUIPluginModel::HostEventNotify *** append error"));       
+                            }
                         iObserver->HostEventNotify(aEventInfo);
                         break;
                         }