Kaydet (Commit) ecae2b16 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

WaE: 'valueOf' is deprecated

Change-Id: I9e7e0872eeb5011b79648e1fca436d09304c44ef
üst 04fe3543
...@@ -237,7 +237,7 @@ void MacabAddressBook::manageDuplicateGroups(::std::vector<MacabGroup *> _xGroup ...@@ -237,7 +237,7 @@ void MacabAddressBook::manageDuplicateGroups(::std::vector<MacabGroup *> _xGroup
{ {
OUString sName = (*iter1)->getName(); OUString sName = (*iter1)->getName();
sName += OUString(" (") + sName += OUString(" (") +
OUString::valueOf(count) + OUString::number(count) +
OUString(")"); OUString(")");
(*iter1)->setName(sName); (*iter1)->setName(sName);
} }
......
...@@ -328,7 +328,7 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const ...@@ -328,7 +328,7 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const
{ {
const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
STR_UNKNOWN_PARA_TYPE, STR_UNKNOWN_PARA_TYPE,
"$position$", OUString::valueOf(parameterIndex) "$position$", OUString::number(parameterIndex)
) ); ) );
::dbtools::throwGenericSQLException(sError,*this); ::dbtools::throwGenericSQLException(sError,*this);
} }
......
...@@ -316,7 +316,7 @@ OUString MacabRecord::fieldToString(const macabfield *_aField) ...@@ -316,7 +316,7 @@ OUString MacabRecord::fieldToString(const macabfield *_aField)
// Should we check for the wrong type here, e.g., a float? // Should we check for the wrong type here, e.g., a float?
sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal);
if(m_bSuccess != sal_False) if(m_bSuccess != sal_False)
fieldString = OUString::valueOf(nVal); fieldString = OUString::number(nVal);
} }
break; break;
case kABRealProperty: case kABRealProperty:
...@@ -326,7 +326,7 @@ OUString MacabRecord::fieldToString(const macabfield *_aField) ...@@ -326,7 +326,7 @@ OUString MacabRecord::fieldToString(const macabfield *_aField)
// Should we check for the wrong type here, e.g., an int? // Should we check for the wrong type here, e.g., an int?
sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal);
if(m_bSuccess != sal_False) if(m_bSuccess != sal_False)
fieldString = OUString::valueOf(nVal); fieldString = OUString::number(nVal);
} }
break; break;
default: default:
......
...@@ -761,7 +761,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert ...@@ -761,7 +761,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
{ {
arrValue = (CFTypeRef) CFArrayGetValueAtIndex( (CFArrayRef) _propertyValue, i); arrValue = (CFTypeRef) CFArrayGetValueAtIndex( (CFArrayRef) _propertyValue, i);
arrType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(arrValue) ); arrType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(arrValue) );
arrLabelString = propertyNameString + OUString::valueOf(i); arrLabelString = propertyNameString + OUString::number(i);
arrLabel = OUStringToCFString(arrLabelString); arrLabel = OUStringToCFString(arrLabelString);
arrHeaders[i] = createHeaderForProperty(arrType, arrValue, arrLabel); arrHeaders[i] = createHeaderForProperty(arrType, arrValue, arrLabel);
if (!arrHeaders[i]) if (!arrHeaders[i])
...@@ -836,7 +836,7 @@ void MacabRecords::manageDuplicateHeaders(macabfield **_headerNames, const sal_I ...@@ -836,7 +836,7 @@ void MacabRecords::manageDuplicateHeaders(macabfield **_headerNames, const sal_I
// There is probably a better way to do this... // There is probably a better way to do this...
OUString newName = CFStringToOUString((CFStringRef) _headerNames[i]->value); OUString newName = CFStringToOUString((CFStringRef) _headerNames[i]->value);
CFRelease(_headerNames[i]->value); CFRelease(_headerNames[i]->value);
newName += OUString(" (") + OUString::valueOf(count) + OUString(")"); newName += OUString(" (") + OUString::number(count) + OUString(")");
_headerNames[i]->value = OUStringToCFString(newName); _headerNames[i]->value = OUStringToCFString(newName);
} }
} }
...@@ -957,7 +957,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT ...@@ -957,7 +957,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
{ {
bPlaced = sal_False; bPlaced = sal_False;
i++; i++;
columnName = OUString(_propertyName) + OUString(" (") + OUString::valueOf(i) + OUString(")"); columnName = OUString(_propertyName) + OUString(" (") + OUString::number(i) + OUString(")");
} }
// success! // success!
...@@ -986,7 +986,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT ...@@ -986,7 +986,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
for(i = 0; i < arrLength; i++) for(i = 0; i < arrLength; i++)
{ {
arrValue = CFArrayGetValueAtIndex( (CFArrayRef) _propertyValue, i); arrValue = CFArrayGetValueAtIndex( (CFArrayRef) _propertyValue, i);
newPropertyName = _propertyName + OUString::valueOf(i); newPropertyName = _propertyName + OUString::number(i);
insertPropertyIntoMacabRecord(_abrecord, _header, newPropertyName, arrValue); insertPropertyIntoMacabRecord(_abrecord, _header, newPropertyName, arrValue);
CFRelease(arrValue); CFRelease(arrValue);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment