diff --git a/mozilla/extensions/xmlterm/base/mozLineTerm.cpp b/mozilla/extensions/xmlterm/base/mozLineTerm.cpp index 21bc3f5423e..544f491a760 100644 --- a/mozilla/extensions/xmlterm/base/mozLineTerm.cpp +++ b/mozilla/extensions/xmlterm/base/mozLineTerm.cpp @@ -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 diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp index 56e626398d5..91d0f089ece 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp @@ -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())); } diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp index 6c2ca97740d..4422f9d5de7 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp @@ -264,7 +264,7 @@ NS_IMETHODIMP mozXMLTermSession::Init(mozIXMLTerminal* aXMLTerminal, nsCOMPtr 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("\n"); } @@ -1262,7 +1262,7 @@ NS_IMETHODIMP mozXMLTermSession::ExportHTML(const PRUnichar* aFilename, cString.Append(";\n"); cString.Append("\n"); - cString.AppendWithConversion(htmlString); + AppendUTF16toUTF8(htmlString, cString); cString.Append("\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 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 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("GetAttribute(attName, attValue); @@ -2788,7 +2788,7 @@ NS_IMETHODIMP mozXMLTermSession::DeepSanitizeFragment( for (j=0; j 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 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 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 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 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 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 domDoc; @@ -378,9 +378,9 @@ NS_IMETHODIMP mozXMLTermStream::SizeToContentHeight(PRInt32 maxHeight) return NS_ERROR_FAILURE; // Get scrollable view - nsCOMPtr scrollableView; + nsIScrollableView* scrollableView; result = mozXMLTermUtils::GetPresContextScrollableView(presContext, - getter_AddRefs(scrollableView)); + &scrollableView); if (NS_FAILED(result) || !scrollableView) return NS_ERROR_FAILURE; diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp index 1604106d95b..2dcb825eb5a 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp @@ -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; } diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp index de472dd2d92..82561cdd275 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -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 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 textDataObj ( do_QueryInterface(genericDataObj) ); if (textDataObj && objLen > 0) { PRUnichar* text = nsnull;