зеркало из https://github.com/mozilla/gecko-dev.git
toString -> ToString idl change.
This commit is contained in:
Родитель
268234cadd
Коммит
72c115383c
|
@ -1386,7 +1386,7 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
|
|||
if ( textDataObj )
|
||||
{
|
||||
char* text = nsnull;
|
||||
textDataObj->toString(&text);
|
||||
textDataObj->ToString(&text);
|
||||
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
|
||||
if ( htmlEditor && text )
|
||||
htmlEditor->InsertText(text);
|
||||
|
|
|
@ -2804,7 +2804,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation()
|
|||
nsCOMPtr<nsISupportsWString> dataObj ( do_QueryInterface(genericDataObj) );
|
||||
if ( dataObj ) {
|
||||
PRUnichar* textData = nsnull;
|
||||
dataObj->toString ( &textData );
|
||||
dataObj->ToString ( &textData );
|
||||
nsAutoString text ( textData );
|
||||
rv = InsertAsPlaintextQuotation(text);
|
||||
}
|
||||
|
@ -3035,7 +3035,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste()
|
|||
if (textDataObj && len > 0)
|
||||
{
|
||||
PRUnichar* text = nsnull;
|
||||
textDataObj->toString ( &text );
|
||||
textDataObj->ToString ( &text );
|
||||
nsAutoString stuffToPaste;
|
||||
stuffToPaste.SetString ( text, len / 2 );
|
||||
rv = InsertHTML(stuffToPaste);
|
||||
|
@ -3047,7 +3047,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste()
|
|||
if (textDataObj && len > 0)
|
||||
{
|
||||
char* text = nsnull;
|
||||
textDataObj->toString ( &text );
|
||||
textDataObj->ToString ( &text );
|
||||
nsAutoString stuffToPaste;
|
||||
stuffToPaste.SetString ( text, len );
|
||||
rv = InsertText(stuffToPaste);
|
||||
|
|
|
@ -2804,7 +2804,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation()
|
|||
nsCOMPtr<nsISupportsWString> dataObj ( do_QueryInterface(genericDataObj) );
|
||||
if ( dataObj ) {
|
||||
PRUnichar* textData = nsnull;
|
||||
dataObj->toString ( &textData );
|
||||
dataObj->ToString ( &textData );
|
||||
nsAutoString text ( textData );
|
||||
rv = InsertAsPlaintextQuotation(text);
|
||||
}
|
||||
|
@ -3035,7 +3035,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste()
|
|||
if (textDataObj && len > 0)
|
||||
{
|
||||
PRUnichar* text = nsnull;
|
||||
textDataObj->toString ( &text );
|
||||
textDataObj->ToString ( &text );
|
||||
nsAutoString stuffToPaste;
|
||||
stuffToPaste.SetString ( text, len / 2 );
|
||||
rv = InsertHTML(stuffToPaste);
|
||||
|
@ -3047,7 +3047,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste()
|
|||
if (textDataObj && len > 0)
|
||||
{
|
||||
char* text = nsnull;
|
||||
textDataObj->toString ( &text );
|
||||
textDataObj->ToString ( &text );
|
||||
nsAutoString stuffToPaste;
|
||||
stuffToPaste.SetString ( text, len );
|
||||
rv = InsertText(stuffToPaste);
|
||||
|
|
|
@ -1386,7 +1386,7 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
|
|||
if ( textDataObj )
|
||||
{
|
||||
char* text = nsnull;
|
||||
textDataObj->toString(&text);
|
||||
textDataObj->ToString(&text);
|
||||
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
|
||||
if ( htmlEditor && text )
|
||||
htmlEditor->InsertText(text);
|
||||
|
|
|
@ -291,7 +291,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData()
|
|||
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
|
||||
if ( currentFlavor ) {
|
||||
char* flavorStr;
|
||||
currentFlavor->toString(&flavorStr);
|
||||
currentFlavor->ToString(&flavorStr);
|
||||
gint format = GetFormat(flavorStr);
|
||||
|
||||
// add these types as selection targets
|
||||
|
@ -563,7 +563,7 @@ nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable)
|
|||
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
|
||||
if ( currentFlavor ) {
|
||||
char* flavorStr;
|
||||
currentFlavor->toString ( &flavorStr );
|
||||
currentFlavor->ToString ( &flavorStr );
|
||||
gint format = GetFormat(flavorStr);
|
||||
|
||||
if (DoConvert(format)) {
|
||||
|
|
|
@ -132,7 +132,7 @@ nsClipboard :: SetNativeClipboardData()
|
|||
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
|
||||
if ( currentFlavor ) {
|
||||
char* flavorStr;
|
||||
currentFlavor->toString(&flavorStr);
|
||||
currentFlavor->ToString(&flavorStr);
|
||||
|
||||
// find MacOS flavor
|
||||
ResType macOSFlavor = theMapper.MapMimeTypeToMacOSType(flavorStr);
|
||||
|
@ -212,7 +212,7 @@ nsClipboard :: GetNativeClipboardData(nsITransferable * aTransferable)
|
|||
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
|
||||
if ( currentFlavor ) {
|
||||
char* flavorStr;
|
||||
currentFlavor->toString ( &flavorStr );
|
||||
currentFlavor->ToString ( &flavorStr );
|
||||
|
||||
// find MacOS flavor
|
||||
ResType macOSFlavor = theMapper.MapMimeTypeToMacOSType(flavorStr);
|
||||
|
|
|
@ -212,7 +212,7 @@ nsDragService :: RegisterDragItemsAndFlavors ( nsISupportsArray * inArray )
|
|||
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericWrapper) );
|
||||
if ( currentFlavor ) {
|
||||
char* flavorStr = nsnull;
|
||||
currentFlavor->toString ( &flavorStr );
|
||||
currentFlavor->ToString ( &flavorStr );
|
||||
FlavorType macOSFlavor = theMapper.MapMimeTypeToMacOSType(flavorStr);
|
||||
::AddDragItemFlavor ( mDragRef, itemIndex, macOSFlavor, NULL, 0, flags );
|
||||
delete [] flavorStr;
|
||||
|
@ -282,7 +282,7 @@ nsDragService :: GetData ( nsITransferable * aTransferable, PRUint32 aItemIndex
|
|||
if ( currentFlavor ) {
|
||||
// find MacOS flavor
|
||||
char* flavorStr;
|
||||
currentFlavor->toString ( &flavorStr );
|
||||
currentFlavor->ToString ( &flavorStr );
|
||||
FlavorType macOSFlavor = theMapper.MapMimeTypeToMacOSType(flavorStr);
|
||||
printf("looking for data in type %s, mac flavor %ld\n", flavorStr, macOSFlavor);
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ nsresult nsClipboard::SetupNativeDataObject(nsITransferable * aTransferable, IDa
|
|||
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
|
||||
if ( currentFlavor ) {
|
||||
char* flavorStr;
|
||||
currentFlavor->toString(&flavorStr);
|
||||
currentFlavor->ToString(&flavorStr);
|
||||
UINT format = GetFormat(flavorStr);
|
||||
|
||||
// check here to see if we can the data back from global member
|
||||
|
@ -538,7 +538,7 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject * aDataObject,
|
|||
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
|
||||
if ( currentFlavor ) {
|
||||
char* flavorStr;
|
||||
currentFlavor->toString(&flavorStr);
|
||||
currentFlavor->ToString(&flavorStr);
|
||||
UINT format = GetFormat(flavorStr);
|
||||
|
||||
void * data;
|
||||
|
@ -651,7 +651,7 @@ NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
|
|||
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
|
||||
if ( currentFlavor ) {
|
||||
char* flavorStr;
|
||||
currentFlavor->toString(&flavorStr);
|
||||
currentFlavor->ToString(&flavorStr);
|
||||
UINT format = GetFormat(flavorStr);
|
||||
|
||||
void * data;
|
||||
|
|
|
@ -220,7 +220,7 @@ nsXIFFormatConverter::Convert(const char *aFromDataFlavor, nsISupports *aFromDat
|
|||
nsCOMPtr<nsISupportsWString> dataWrapper ( do_QueryInterface(aFromData) );
|
||||
if ( dataWrapper ) {
|
||||
PRUnichar* data = nsnull;
|
||||
dataWrapper->toString ( &data );
|
||||
dataWrapper->ToString ( &data );
|
||||
if ( data ) {
|
||||
nsAutoString dataStr ( data );
|
||||
nsAutoString outStr;
|
||||
|
|
Загрузка…
Ссылка в новой задаче