platform/symbian/rhodes/src/phonebook/Phonebook.cpp in rhodes-3.0.2 vs platform/symbian/rhodes/src/phonebook/Phonebook.cpp in rhodes-3.1.0.beta.1

@@ -38,11 +38,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <rhodes.rsg>
+//#include <rhodes.rsg>
 
 //IMPLEMENT_LOGCLASS(CPhonebook,"Phonebook");
 
 CPhonebook::CPhonebook()
 	{
@@ -74,24 +74,24 @@
 	}
 
 void CPhonebook::ConstructL()
 	{
 		// Read name of the default database
-		_LIT( KOrgContactFile,"" );
+                //_LIT( KOrgContactFile,"" );
 		
-		TBuf<KMaxDatabasePathAndNameLength> orgContactFile( KOrgContactFile );
-		CContactDatabase::GetDefaultNameL( orgContactFile );
-		orgContactFile.LowerCase();
+                //TBuf<KMaxDatabasePathAndNameLength> orgContactFile( KOrgContactFile );
+                //CContactDatabase::GetDefaultNameL( orgContactFile );
+                //orgContactFile.LowerCase();
 	
-		TRAPD(err, iContactDb = CContactDatabase::OpenL( orgContactFile ););
+                TRAPD(err, iContactDb = CContactDatabase::OpenL( ););//orgContactFile ););
 		// Check if database already exist
 	    if ( err == KErrNotFound )
 		{
-		    HBufC* text = StringLoader::LoadLC( R_CONTACTS_DB_NOT_FOUND );
+                    /*HBufC* text = StringLoader::LoadLC( R_CONTACTS_DB_NOT_FOUND );
 		    CAknInformationNote* informationNote = new (ELeave) CAknInformationNote;
 		    informationNote->ExecuteLD( *text );
-		    CleanupStack::PopAndDestroy( text );
+                    CleanupStack::PopAndDestroy( text );*/
 		    iContactDb = NULL;
 		}
 	}
 
 /**
@@ -123,24 +123,24 @@
     char* value = descriptorToStringL(aValue);
         
     if ( key && value )
 	{
 		//LOG(INFO) + "Adding field [" + key + ":" + value + "]";
-		addStrToHash(*hash, key, value, strlen(value));
+                addStrToHash(*hash, key, value);
     }
         
     if ( value )
     	free( value );
 }
 
 VALUE CPhonebook::getFields(CContactItemFieldSet& fieldSet, char* id) 
 {
-	VALUE hash = createHash();
+        VALUE hash = rho_ruby_createHash();
 	
 	// Get field ID
 	//LOG(INFO) + "Adding field [id:" + id + "]";
-	addStrToHash(hash, RUBY_PB_ID, id, strlen(id));
+        addStrToHash(hash, RUBY_PB_ID, id);
 	
 	// Get first name
     TInt findpos( fieldSet.Find( KUidContactFieldGivenName ) );
 
     // Check that the first name field is actually there.
@@ -151,11 +151,11 @@
         TPtrC value = firstName->Text();
         add2hash(&hash, RUBY_PB_FIRST_NAME, value);
     }
     else
 	{
-		addStrToHash(hash, RUBY_PB_FIRST_NAME, "", strlen(""));
+                addStrToHash(hash, RUBY_PB_FIRST_NAME, "");
 	}
 
     // Get last name
     findpos = fieldSet.Find( KUidContactFieldFamilyName );
 
@@ -167,11 +167,11 @@
         TPtrC value = lastName->Text();
         add2hash(&hash, RUBY_PB_LAST_NAME, value);
     }
     else
 	{
-		addStrToHash(hash, RUBY_PB_LAST_NAME, "", strlen(""));
+                addStrToHash(hash, RUBY_PB_LAST_NAME, "");
 	}
     
     // Get home phone
     findpos = fieldSet.Find( KUidContactFieldPhoneNumber );
 
@@ -185,13 +185,13 @@
         add2hash(&hash, RUBY_PB_MOBILE_NUMBER, value);
         add2hash(&hash, RUBY_PB_BUSINESS_NUMBER, value);
     }
     else
 	{
-		addStrToHash(hash, RUBY_PB_HOME_NUMBER, "", strlen(""));
-		addStrToHash(hash, RUBY_PB_MOBILE_NUMBER, "", strlen(""));
-		addStrToHash(hash, RUBY_PB_BUSINESS_NUMBER, "", strlen(""));
+                addStrToHash(hash, RUBY_PB_HOME_NUMBER, "");
+                addStrToHash(hash, RUBY_PB_MOBILE_NUMBER, "");
+                addStrToHash(hash, RUBY_PB_BUSINESS_NUMBER, "");
 	}
     
     // Get email
     findpos = fieldSet.Find( KUidContactFieldEMail );
 
@@ -203,11 +203,11 @@
         TPtrC value = textField->Text();
         add2hash(&hash, RUBY_PB_EMAIL_ADDRESS, value);
     }
     else
 	{
-		addStrToHash(hash, RUBY_PB_EMAIL_ADDRESS, "", strlen(""));
+                addStrToHash(hash, RUBY_PB_EMAIL_ADDRESS, "");
 	}
     
     // Get company
     findpos = fieldSet.Find( KUidContactFieldCompanyName );
 
@@ -219,18 +219,18 @@
         TPtrC value = textField->Text();
         add2hash(&hash, RUBY_PB_COMPANY_NAME, value);
     }
     else
 	{
-		addStrToHash(hash, RUBY_PB_COMPANY_NAME, "", strlen(""));
+                addStrToHash(hash, RUBY_PB_COMPANY_NAME, "");
 	}
     
 	return hash;
 }
 
 VALUE CPhonebook::getallPhonebookRecords() 
 {
-	VALUE hash = createHash(); //retval
+        VALUE hash = rho_ruby_createHash(); //retval
 	
 	iContactDb->SetDbViewContactType( KUidContactCard );
 
     TFieldType aFieldType1( KUidContactFieldFamilyName );
     TFieldType aFieldType2( KUidContactFieldGivenName );