From d4634024f7eb4a9646f24127bde72d99fa405fc7 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Sun, 18 Nov 2001 11:58:27 +0000 Subject: [PATCH] Coping with yet another string change git-svn-id: svn://10.0.0.236/trunk@108442 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/qt/nsFontMetricsQT.cpp | 2 +- mozilla/widget/src/qt/nsClipboard.cpp | 4 ++-- mozilla/widget/src/qt/nsDragService.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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); } } }