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

remove *WithConversion from xmlterm r+sr=roc Bug 252940

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@160286 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de
2004-08-03 13:46:52 +00:00
parent afe3daecca
commit ae1d79edde
6 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/extensions/xmlterm/base/mozLineTerm.cpp
View File

@@ -359,8 +359,7 @@ NS_IMETHODIMP mozLineTerm::OpenAux(const PRUnichar *command,
XMLT_LOG(mozLineTerm::Open,22, ("mCookie=%s\n", cookieCStr));
// Convert initInput to CString
nsCAutoString initCStr;
initCStr.AssignWithConversion(initInput);
NS_LossyConvertUTF16toASCII initCStr(initInput); // XXX ASCII?
XMLT_LOG(mozLineTerm::Open,22, ("initInput=%s\n", initCStr.get()));
// List of prompt delimiters

2
mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp
View File

@@ -272,7 +272,7 @@ mozXMLTermKeyListener::KeyPress(nsIDOMEvent* aKeyEvent)
if (NS_SUCCEEDED(result) && parentNode) {
result = parentNode->GetNodeName(nodeName);
if (NS_SUCCEEDED(result)) {
nsCAutoString CNodeName; CNodeName.AssignWithConversion(nodeName);
NS_ConvertUTF16toUTF8 CNodeName(nodeName);
XMLT_LOG(mozXMLTermKeyListener::KeyPress,58,("nodeName=%s\n",
CNodeName.get()));
}

58
mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp
View File

@@ -264,7 +264,7 @@ NS_IMETHODIMP mozXMLTermSession::Init(mozIXMLTerminal* aXMLTerminal,
nsCOMPtr<nsIDOMElement> sessionElement;
nsAutoString sessionID;
sessionID.AssignWithConversion(sessionElementNames[SESSION_ELEMENT]);
sessionID.AssignASCII(sessionElementNames[SESSION_ELEMENT]);
result = vDOMHTMLDocument->GetElementById(sessionID,
getter_AddRefs(sessionElement));
@@ -1253,7 +1253,7 @@ NS_IMETHODIMP mozXMLTermSession::ExportHTML(const PRUnichar* aFilename,
if (style) {
cString.Append("<style type='text/css'>\n");
cString.AppendWithConversion(style);
AppendUTF16toUTF8(style, cString);
cString.Append("</style>\n");
}
@@ -1262,7 +1262,7 @@ NS_IMETHODIMP mozXMLTermSession::ExportHTML(const PRUnichar* aFilename,
cString.Append(";</script>\n");
cString.Append("<script language='JavaScript' src='xmlt.js'></script>\n</head>");
cString.AppendWithConversion(htmlString);
AppendUTF16toUTF8(htmlString, cString);
cString.Append("</html>\n");
@@ -1579,7 +1579,7 @@ NS_IMETHODIMP mozXMLTermSession::InitStream(const nsString& streamURL,
break;
}
nsCAutoString url; url.AssignWithConversion(streamURL);
NS_ConvertUTF16toUTF8 url(streamURL);
result = mXMLTermStream->Open(outerDOMWindow, iframeName.get(),
url.get(),
contentType.get(), 800);
@@ -1848,7 +1848,7 @@ NS_IMETHODIMP mozXMLTermSession::LimitOutputLines(PRBool deleteAllOld)
// Create warning message element
nsCOMPtr<nsIDOMNode> divNode, textNode;
nsAutoString tagName(NS_LITERAL_STRING("div"));
nsAutoString elementName; elementName.AssignWithConversion(sessionElementNames[WARNING_ELEMENT]);
nsAutoString elementName; elementName.AssignASCII(sessionElementNames[WARNING_ELEMENT]);
result = NewElementWithText(tagName, elementName, -1,
mOutputBlockNode, divNode, textNode,
firstChild);
@@ -2022,17 +2022,17 @@ NS_IMETHODIMP mozXMLTermSession::AppendOutput(const nsString& aString,
if (uniformStyle == LTERM_STDIN_STYLE) {
preDisplayType = PRE_STDIN_NODE;
elementName.AssignWithConversion(sessionElementNames[STDIN_ELEMENT]);
elementName.AssignASCII(sessionElementNames[STDIN_ELEMENT]);
XMLT_LOG(mozXMLTermSession::AppendOutput,72, ("PRE_STDIN_NODE\n"));
} else if (uniformStyle == LTERM_STDERR_STYLE) {
preDisplayType = PRE_STDERR_NODE;
elementName.AssignWithConversion(sessionElementNames[STDERR_ELEMENT]);
elementName.AssignASCII(sessionElementNames[STDERR_ELEMENT]);
XMLT_LOG(mozXMLTermSession::AppendOutput,72, ("PRE_STDERR_NODE\n"));
} else {
preDisplayType = PRE_STDOUT_NODE;
elementName.AssignWithConversion(sessionElementNames[STDOUT_ELEMENT]);
elementName.AssignASCII(sessionElementNames[STDOUT_ELEMENT]);
XMLT_LOG(mozXMLTermSession::AppendOutput,72, ("PRE_STDOUT_NODE\n"));
}
@@ -2132,7 +2132,7 @@ NS_IMETHODIMP mozXMLTermSession::AppendOutput(const nsString& aString,
return result;
// Create new DIV node
nsAutoString elementName; elementName.AssignWithConversion(sessionElementNames[MIXED_ELEMENT]);
nsAutoString elementName; elementName.AssignASCII(sessionElementNames[MIXED_ELEMENT]);
nsCOMPtr<nsIDOMNode> divNode;
nsAutoString tagName(NS_LITERAL_STRING("div"));
result = NewElement(tagName, elementName, -1,
@@ -2167,13 +2167,13 @@ NS_IMETHODIMP mozXMLTermSession::AppendOutput(const nsString& aString,
// Change of style or end of string
switch (currentStyle) {
case LTERM_STDIN_STYLE:
elementName.AssignWithConversion(sessionElementNames[STDIN_ELEMENT]);
elementName.AssignASCII(sessionElementNames[STDIN_ELEMENT]);
break;
case LTERM_STDERR_STYLE:
elementName.AssignWithConversion(sessionElementNames[STDERR_ELEMENT]);
elementName.AssignASCII(sessionElementNames[STDERR_ELEMENT]);
break;
default:
elementName.AssignWithConversion(sessionElementNames[STDOUT_ELEMENT]);
elementName.AssignASCII(sessionElementNames[STDOUT_ELEMENT]);
break;
}
@@ -2349,17 +2349,17 @@ NS_IMETHODIMP mozXMLTermSession::AppendLineLS(const nsString& aString,
// Append to markup string
markupString.AssignLiteral("<span class=\"");
markupString.AssignWithConversion(fileTypeNames[fileType]);
markupString.AssignASCII(fileTypeNames[fileType]);
markupString.AssignLiteral("\"");
int j;
for (j=0; j<SESSION_EVENT_TYPES; j++) {
markupString.AssignLiteral(" on");
markupString.AssignWithConversion(sessionEventNames[j]);
markupString.AssignASCII(sessionEventNames[j]);
markupString.AssignLiteral("=\"return HandleEvent(event, '");
markupString.AssignWithConversion(sessionEventNames[j]);
markupString.AssignASCII(sessionEventNames[j]);
markupString.AssignLiteral("','");
markupString.AssignWithConversion(fileTypeNames[fileType]);
markupString.AssignASCII(fileTypeNames[fileType]);
markupString.AssignLiteral("',-#,'");
markupString.Assign(pathname);
markupString.Assign(NS_LITERAL_STRING("');\""));
@@ -2711,7 +2711,7 @@ NS_IMETHODIMP mozXMLTermSession::DeepSanitizeFragment(
for (j=0; j<SESSION_EVENT_TYPES; j++) {
attName.AssignLiteral("on");
attName.AppendWithConversion(sessionEventNames[j]);
attName.AppendASCII(sessionEventNames[j]);
attValue.SetLength(0);
result = domElement->GetAttribute(attName, attValue);
@@ -2788,7 +2788,7 @@ NS_IMETHODIMP mozXMLTermSession::DeepSanitizeFragment(
for (j=0; j<SESSION_EVENT_TYPES; j++) {
// Re-introduce sanitized event attribute values
attName.AssignLiteral("on");
attName.AppendWithConversion(sessionEventNames[j]);
attName.AppendASCII(sessionEventNames[j]);
attValue = eventAttrVals[j];
if (!attValue.IsEmpty()) {
@@ -2844,7 +2844,7 @@ NS_IMETHODIMP mozXMLTermSession::DeepRefreshEventHandlers(
// Refresh event attributes
for (j=0; j<SESSION_EVENT_TYPES; j++) {
attName.AssignLiteral("on");
attName.AppendWithConversion(sessionEventNames[j]);
attName.AppendASCII(sessionEventNames[j]);
XMLT_LOG(mozXMLTermSession::DeepRefreshEventHandlers,89,
("Refreshing on%s attribute\n",sessionEventNames[j] ));
@@ -3031,7 +3031,7 @@ void mozXMLTermSession::PositionOutputCursor(mozILineTermAux* lineTermAux)
// Append dummy output line
nsCOMPtr<nsIDOMNode> spanNode, textNode;
nsAutoString tagName(NS_LITERAL_STRING("span"));
nsAutoString elementName; elementName.AssignWithConversion(sessionElementNames[STDOUT_ELEMENT]);
nsAutoString elementName; elementName.AssignASCII(sessionElementNames[STDOUT_ELEMENT]);
result = NewElementWithText(tagName, elementName, -1,
mOutputBlockNode, spanNode, textNode);
@@ -3267,7 +3267,7 @@ NS_IMETHODIMP mozXMLTermSession::NewEntry(const nsString& aPrompt)
// Not first entry
// Add event attributes to current command element
nsAutoString cmdName; cmdName.AssignWithConversion(sessionElementNames[COMMAND_ELEMENT]);
nsAutoString cmdName; cmdName.AssignASCII(sessionElementNames[COMMAND_ELEMENT]);
result = SetEventAttributes(cmdName,
mCurrentEntryNumber,
mCommandSpanNode);
@@ -3307,7 +3307,7 @@ NS_IMETHODIMP mozXMLTermSession::NewEntry(const nsString& aPrompt)
// Create "entry" element
nsCOMPtr<nsIDOMNode> entryNode;
tagName.AssignLiteral("div");
name.AssignWithConversion(sessionElementNames[ENTRY_ELEMENT]);
name.AssignASCII(sessionElementNames[ENTRY_ELEMENT]);
result = NewElement(tagName, name, mCurrentEntryNumber,
mSessionNode, entryNode);
if (NS_FAILED(result) || !entryNode) {
@@ -3323,7 +3323,7 @@ NS_IMETHODIMP mozXMLTermSession::NewEntry(const nsString& aPrompt)
// Create "input" element containing "prompt" and "command" elements
nsCOMPtr<nsIDOMNode> inputNode;
tagName.AssignLiteral("div");
name.AssignWithConversion(sessionElementNames[INPUT_ELEMENT]);
name.AssignASCII(sessionElementNames[INPUT_ELEMENT]);
result = NewElement(tagName, name, mCurrentEntryNumber,
mCurrentEntryNode, inputNode);
if (NS_FAILED(result) || !inputNode) {
@@ -3335,7 +3335,7 @@ NS_IMETHODIMP mozXMLTermSession::NewEntry(const nsString& aPrompt)
// Create prompt element
nsCOMPtr<nsIDOMNode> promptSpanNode;
tagName.AssignLiteral("span");
name.AssignWithConversion(sessionElementNames[PROMPT_ELEMENT]);
name.AssignASCII(sessionElementNames[PROMPT_ELEMENT]);
result = NewElement(tagName, name, mCurrentEntryNumber,
inputNode, promptSpanNode);
if (NS_FAILED(result) || !promptSpanNode) {
@@ -3446,7 +3446,7 @@ NS_IMETHODIMP mozXMLTermSession::NewEntry(const nsString& aPrompt)
// Create command element
nsCOMPtr<nsIDOMNode> newCommandSpanNode;
tagName.AssignLiteral("span");
name.AssignWithConversion(sessionElementNames[COMMAND_ELEMENT]);
name.AssignASCII(sessionElementNames[COMMAND_ELEMENT]);
result = NewElement(tagName, name, mCurrentEntryNumber,
inputNode, newCommandSpanNode);
if (NS_FAILED(result) || !newCommandSpanNode) {
@@ -3467,7 +3467,7 @@ NS_IMETHODIMP mozXMLTermSession::NewEntry(const nsString& aPrompt)
// Create output element and append as child of current entry element
nsCOMPtr<nsIDOMNode> divNode;
tagName.AssignLiteral("div");
name.AssignWithConversion(sessionElementNames[OUTPUT_ELEMENT]);
name.AssignASCII(sessionElementNames[OUTPUT_ELEMENT]);
result = NewElement(tagName, name, mCurrentEntryNumber,
mCurrentEntryNode, divNode);
@@ -4231,10 +4231,10 @@ NS_IMETHODIMP mozXMLTermSession::SetEventAttributes(const nsString& name,
int j;
for (j=0; j<SESSION_EVENT_TYPES; j++) {
nsAutoString attName(NS_LITERAL_STRING("on"));
attName.AppendWithConversion(sessionEventNames[j]);
attName.AppendASCII(sessionEventNames[j]);
nsAutoString attValue(NS_LITERAL_STRING("return HandleEvent(event, '"));
attValue.AppendWithConversion(sessionEventNames[j]);
attValue.AppendASCII(sessionEventNames[j]);
attValue.AppendLiteral("','");
attValue.Append(name);
attValue.AppendLiteral("','");
@@ -4601,7 +4601,7 @@ void mozXMLTermSession::TraverseDOMTree(FILE* fileStream,
// Print selected attribute values
int j;
for (j=0; j<PRINT_ATTRIBUTE_NAMES; j++) {
nsAutoString attName; attName.AssignWithConversion (printAttributeNames[j]);
nsAutoString attName; attName.AssignASCII (printAttributeNames[j]);
nsAutoString attValue;
attValue.SetLength(0);

6
mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp
View File

@@ -128,7 +128,7 @@ NS_IMETHODIMP mozXMLTermStream::Open(nsIDOMWindowInternal* aDOMWindow,
// Open stream in named subframe of current frame
XMLT_LOG(mozXMLTermStream::Open,22,("frameName=%s\n", frameName));
nsAutoString innerFrameName; innerFrameName.AssignWithConversion(frameName);
nsAutoString innerFrameName; innerFrameName.AssignASCII(frameName);
// Get DOM IFRAME element
nsCOMPtr<nsIDOMDocument> domDoc;
@@ -378,9 +378,9 @@ NS_IMETHODIMP mozXMLTermStream::SizeToContentHeight(PRInt32 maxHeight)
return NS_ERROR_FAILURE;
// Get scrollable view
nsCOMPtr<nsIScrollableView> scrollableView;
nsIScrollableView* scrollableView;
result = mozXMLTermUtils::GetPresContextScrollableView(presContext,
getter_AddRefs(scrollableView));
&scrollableView);
if (NS_FAILED(result) || !scrollableView)
return NS_ERROR_FAILURE;

10
mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp
View File

@@ -287,7 +287,7 @@ mozXMLTermUtils::ExecuteScript(nsIDOMDocument* aDOMDocument,
* or a null string if the attribute is not defined, or if the DOM node
* is not an element.
* @param aDOMNode node whose attribute is to be determined
* @param aAttName attribute to be determined
* @param aAttName attribute to be determined. Must be ASCII.
* @param aAttValue output attribute value
* @return NS_OK if no errors occurred
*/
@@ -305,7 +305,7 @@ mozXMLTermUtils::GetNodeAttribute(nsIDOMNode* aDOMNode,
}
nsAutoString attName;
attName.AssignWithConversion(aAttName);
attName.AssignASCII(aAttName);
return domElement->GetAttribute(attName, aAttValue);
}
@@ -343,7 +343,7 @@ NS_IMETHODIMP mozXMLTermUtils::TimeStamp(PRInt32 deltaSec, PRTime& lastTime,
PR_ExplodeTime(curTime, PR_LocalTimeParameters, &localTime);
PRInt32 nWritten = PR_snprintf(dateStr, DATE_LEN+1,
"%02d:%02d:%02d %02d/%02d/%04d",
"%02d:%02d:%02d %02d/%02d/%04d", // XXX i18n!
localTime.tm_hour, localTime.tm_min, localTime.tm_sec,
localTime.tm_mday, localTime.tm_month+1, localTime.tm_year);
@@ -352,7 +352,7 @@ NS_IMETHODIMP mozXMLTermUtils::TimeStamp(PRInt32 deltaSec, PRTime& lastTime,
XMLT_LOG(mozXMLTermUtils::LocalTime,99,("localTime=%s\n", dateStr));
aTimeStamp.AssignWithConversion(dateStr);
aTimeStamp.AssignASCII(dateStr);
return NS_OK;
}
@@ -390,7 +390,7 @@ NS_IMETHODIMP mozXMLTermUtils::RandomCookie(nsString& aCookie)
}
cookie[11] = '\0';
aCookie.AssignWithConversion(cookie);
aCookie.AssignASCII(cookie);
return NS_OK;
}

15
mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp
View File

@@ -58,6 +58,7 @@
#include "nsICaret.h"
#include "nsRect.h"
#include "nsIURI.h"
#include "nsNetUtil.h"
#include "nsIDOMEventReceiver.h"
#include "nsIDOMEventListener.h"
@@ -248,11 +249,8 @@ NS_IMETHODIMP mozXMLTerminal::Init(nsIDocShell* aDocShell,
XMLT_LOG(mozXMLTerminal::Init,22,("done setting DocLoaderObs\n"));
// Load initial XMLterm background document
nsCAutoString urlCString;
urlCString.AssignWithConversion(aURL);
nsCOMPtr<nsIURI> uri;
result = uri->SetSpec(urlCString);
result = NS_NewURI(getter_AddRefs(uri), nsDependentString(aURL));
if (NS_FAILED(result))
return NS_ERROR_FAILURE;
@@ -790,14 +788,9 @@ NS_IMETHODIMP mozXMLTerminal::Paste()
if (NS_FAILED(result))
return result;
nsAutoString flavor;
flavor.AssignWithConversion(bestFlavor);
XMLT_LOG(mozXMLTerminal::Paste,20,("flavour=%s\n", bestFlavor));
char* temCStr = ToNewCString(flavor);
XMLT_LOG(mozXMLTerminal::Paste,20,("flavour=%s\n", temCStr));
nsMemory::Free(temCStr);
if (flavor.EqualsLiteral(kHTMLMime) || flavor.EqualsLiteral(kUnicodeMime)) {
if (strcmp(bestFlavor, kHTMLMime) == 0 || strcmp(bestFlavor, kUnicodeMime) == 0) {
nsCOMPtr<nsISupportsString> textDataObj ( do_QueryInterface(genericDataObj) );
if (textDataObj && objLen > 0) {
PRUnichar* text = nsnull;