Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 53057: Fixing up users of implicit |CharT*| conversion operators for nsCString to use |.get()| instead, rr=dbaron, rs=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@106325 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com 2001-10-26 04:24:06 +00:00
parent 02e1a52c53
commit 173b301199
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/widget/src/gtk/nsClipboard.cpp
View File

@ -469,9 +469,9 @@ nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable,
if ( foundData ) {
nsCOMPtr<nsISupports> genericDataWrapper;
nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor, mSelectionData.data,
nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor.get(), mSelectionData.data,
mSelectionData.length, getter_AddRefs(genericDataWrapper));
aTransferable->SetTransferData(foundFlavor,
aTransferable->SetTransferData(foundFlavor.get(),
genericDataWrapper,
mSelectionData.length);
}

8
mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
View File

@ -1071,9 +1071,9 @@ nsBaseWidget::debug_DumpEvent(FILE * aFileOut,
fprintf(aFileOut,
"%4d %-26s widget=%-8p name=%-12s id=%-8p pos=%d,%d\n",
_GetPrintCount(),
(const char *) tempString,
tempString.get(),
(void *) aWidget,
(const char *) aWidgetName,
aWidgetName.get(),
(void *) (aWindowID ? aWindowID : 0x0),
aGuiEvent->point.x,
aGuiEvent->point.y);
@ -1097,7 +1097,7 @@ nsBaseWidget::debug_DumpPaintEvent(FILE * aFileOut,
"%4d PAINT widget=%p name=%-12s id=%-8p rect=",
_GetPrintCount(),
(void *) aWidget,
(const char *) aWidgetName,
aWidgetName.get(),
(void *) aWindowID);
if (aPaintEvent->rect)
@ -1135,7 +1135,7 @@ nsBaseWidget::debug_DumpInvalidate(FILE * aFileOut,
"%4d Invalidate widget=%p name=%-12s id=%-8p",
_GetPrintCount(),
(void *) aWidget,
(const char *) aWidgetName,
aWidgetName.get(),
(void *) aWindowID);
if (aRect)

6
mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp
View File

@ -245,7 +245,7 @@ nsHTMLFormatConverter::Convert(const char *aFromDataFlavor, nsISupports *aFromDa
nsresult res;
if (toFlavor.Equals(kHTMLMime)) {
PRInt32 dataLen = dataStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor, (void*)dataStr.get(), dataLen, aToData );
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)dataStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
} else {
@ -253,7 +253,7 @@ nsHTMLFormatConverter::Convert(const char *aFromDataFlavor, nsISupports *aFromDa
res = ConvertFromHTMLToUnicode(dataStr, outStr);
if (NS_SUCCEEDED(res)) {
PRInt32 dataLen = outStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor, (void*)outStr.get(), dataLen, aToData );
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)outStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
}
@ -263,7 +263,7 @@ nsHTMLFormatConverter::Convert(const char *aFromDataFlavor, nsISupports *aFromDa
nsAutoString outStr;
if ( NS_SUCCEEDED(ConvertFromHTMLToAOLMail(dataStr, outStr)) ) {
PRInt32 dataLen = outStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor, (void*)outStr.get(), dataLen, aToData );
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)outStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
}

2
mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp
View File

@ -155,7 +155,7 @@ nsPrimitiveHelpers :: ConvertUnicodeToPlatformPlainText ( PRUnichar* inUnicode,
cPlatformCharset.AssignWithConversion(platformCharset);
nsCOMPtr<nsISaveAsCharset> converter = do_CreateInstance("@mozilla.org/intl/saveascharset;1");
converter->Init(cPlatformCharset,
converter->Init(cPlatformCharset.get(),
nsISaveAsCharset::attr_EntityAfterCharsetConv +
nsISaveAsCharset::attr_FallbackQuestionMark,
nsIEntityConverter::transliterate);

4
mozilla/widget/src/xremoteclient/XRemoteClient.cpp
View File

@ -359,7 +359,7 @@ XRemoteClient::GetLock(Window aWindow, PRBool *aDestroyed)
XChangeProperty (mDisplay, aWindow, mMozLockAtom, XA_STRING, 8,
PropModeReplace,
(unsigned char *) mLockData.get(),
strlen (mLockData));
mLockData.Length());
locked = True;
}
@ -462,7 +462,7 @@ XRemoteClient::FreeLock(Window aWindow)
(unsigned int) aWindow));
return NS_ERROR_FAILURE;
}
else if (strcmp((char *)data, mLockData)) {
else if (strcmp((char *)data, mLockData.get())) {
PR_LOG(sRemoteLm, PR_LOG_DEBUG,
(MOZILLA_LOCK_PROP
" was stolen! Expected \"%s\", saw \"%s\"!\n",