diff --git a/mozilla/gfx/src/qt/nsFontMetricsQT.cpp b/mozilla/gfx/src/qt/nsFontMetricsQT.cpp index e8c10125b35..486e265de5d 100644 --- a/mozilla/gfx/src/qt/nsFontMetricsQT.cpp +++ b/mozilla/gfx/src/qt/nsFontMetricsQT.cpp @@ -1538,7 +1538,7 @@ nsFontMetricsQT::FindLocalFont(PRUnichar aChar) if (mFontIsGeneric[mFontsIndex]) { return nsnull; } - QString qName(*(mFonts.CStringAt(mFontsIndex++))); + QString qName((*(mFonts.CStringAt(mFontsIndex++))).get()); nsFontQT *font; font = LoadFont(qName,aChar); diff --git a/mozilla/widget/src/qt/nsClipboard.cpp b/mozilla/widget/src/qt/nsClipboard.cpp index e61be54062d..f9e2be2a644 100644 --- a/mozilla/widget/src/qt/nsClipboard.cpp +++ b/mozilla/widget/src/qt/nsClipboard.cpp @@ -192,10 +192,10 @@ nsClipboard::GetNativeClipboardData(nsITransferable *aTransferable, nsCOMPtr genericDataWrapper; PRUint32 len = (PRUint32)ba.count(); - nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor, + nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor.get(), (void*)ba.data(),len, getter_AddRefs(genericDataWrapper)); - aTransferable->SetTransferData(foundFlavor,genericDataWrapper,len); + aTransferable->SetTransferData(foundFlavor.get(),genericDataWrapper,len); } } } diff --git a/mozilla/widget/src/qt/nsDragService.cpp b/mozilla/widget/src/qt/nsDragService.cpp index 2739ae91204..51813fe3502 100644 --- a/mozilla/widget/src/qt/nsDragService.cpp +++ b/mozilla/widget/src/qt/nsDragService.cpp @@ -251,11 +251,11 @@ NS_IMETHODIMP nsDragService::GetData(nsITransferable *aTransferable, nsCOMPtr genericDataWrapper; PRUint32 len = (PRUint32)ba.count(); - nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor, + nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor.get(), (void*)ba.data(),len, getter_AddRefs(genericDataWrapper)); - aTransferable->SetTransferData(foundFlavor,genericDataWrapper,len); + aTransferable->SetTransferData(foundFlavor.get(),genericDataWrapper,len); } } }