From f7440a0d0d78615ccf6bb768f31eb1d0f73e4a5d Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Tue, 28 Dec 1999 19:37:29 +0000 Subject: [PATCH] fix warnings. git-svn-id: svn://10.0.0.236/trunk@56570 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xul/content/src/nsXULAttributes.cpp | 8 ++++---- mozilla/layout/base/nsCSSRendering.cpp | 4 ++-- mozilla/layout/html/style/src/nsCSSRendering.cpp | 4 ++-- mozilla/layout/xul/base/src/nsBoxFrame.cpp | 2 +- .../netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp | 3 --- mozilla/rdf/content/src/nsXULAttributes.cpp | 8 ++++---- mozilla/xpcom/proxy/src/nsProxyEventObject.cpp | 8 ++++---- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/mozilla/content/xul/content/src/nsXULAttributes.cpp b/mozilla/content/xul/content/src/nsXULAttributes.cpp index bd8a25d6e04..357762a95f0 100644 --- a/mozilla/content/xul/content/src/nsXULAttributes.cpp +++ b/mozilla/content/xul/content/src/nsXULAttributes.cpp @@ -141,11 +141,11 @@ nsXULAttribute::nsXULAttribute(nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aName, const nsString& aValue) - : mNameSpaceID(aNameSpaceID), + : mContent(aContent), + mScriptObject(nsnull), + mNameSpaceID(aNameSpaceID), mName(aName), - mValue(nsnull), - mContent(aContent), - mScriptObject(nsnull) + mValue(nsnull) { NS_INIT_REFCNT(); NS_IF_ADDREF(aName); diff --git a/mozilla/layout/base/nsCSSRendering.cpp b/mozilla/layout/base/nsCSSRendering.cpp index 3165db58616..8d83a858e19 100644 --- a/mozilla/layout/base/nsCSSRendering.cpp +++ b/mozilla/layout/base/nsCSSRendering.cpp @@ -1375,8 +1375,8 @@ nsMargin border; const nsStyleColor* bgColor = nsStyleUtil::FindNonTransparentBackground(aStyleContext); nsStyleCoord bordStyleRadius[4]; PRInt16 borderRadii[4],i; -nsStyleCoord tr,lr,rr,br; -nsStyleCoord borderRadius; +//nsStyleCoord tr,lr,rr,br; +//nsStyleCoord borderRadius; float percent; if (aHardBorderSize > 0) { diff --git a/mozilla/layout/html/style/src/nsCSSRendering.cpp b/mozilla/layout/html/style/src/nsCSSRendering.cpp index 3165db58616..8d83a858e19 100644 --- a/mozilla/layout/html/style/src/nsCSSRendering.cpp +++ b/mozilla/layout/html/style/src/nsCSSRendering.cpp @@ -1375,8 +1375,8 @@ nsMargin border; const nsStyleColor* bgColor = nsStyleUtil::FindNonTransparentBackground(aStyleContext); nsStyleCoord bordStyleRadius[4]; PRInt16 borderRadii[4],i; -nsStyleCoord tr,lr,rr,br; -nsStyleCoord borderRadius; +//nsStyleCoord tr,lr,rr,br; +//nsStyleCoord borderRadius; float percent; if (aHardBorderSize > 0) { diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index b6ec280fdf9..76d51302811 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -2560,7 +2560,7 @@ nsInfoListImpl::SanityCheck(nsFrameList& aFrameList) // ---- box info ------ -nsBoxInfo::nsBoxInfo():prefSize(0,0), minSize(0,0), flex(0), maxSize(NS_INTRINSICSIZE, NS_INTRINSICSIZE) +nsBoxInfo::nsBoxInfo():prefSize(0,0), minSize(0,0), maxSize(NS_INTRINSICSIZE, NS_INTRINSICSIZE), flex(0) { } diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index c5c07bf0d63..3c3088b272c 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -828,7 +828,6 @@ nsFtpConnectionThread::SetStreamObserver(nsIStreamObserver* aObserver, nsISuppor nsresult nsFtpConnectionThread::SetStreamListener(nsIStreamListener* aListener, nsISupports *aContext) { - nsresult rv = NS_OK; mListener = aListener; mListenerContext = aContext; return NS_OK; @@ -1387,7 +1386,6 @@ nsFtpConnectionThread::S_list() { FTP_STATE nsFtpConnectionThread::R_list() { - nsresult rv = NS_OK; if ((mResponseCode/100 == 4) || (mResponseCode/100 == 5)) { @@ -1433,7 +1431,6 @@ nsFtpConnectionThread::S_retr() { FTP_STATE nsFtpConnectionThread::R_retr() { - nsresult rv = NS_OK; if (mResponseCode/100 == 1) { // success. return FTP_READ_BUF; diff --git a/mozilla/rdf/content/src/nsXULAttributes.cpp b/mozilla/rdf/content/src/nsXULAttributes.cpp index bd8a25d6e04..357762a95f0 100644 --- a/mozilla/rdf/content/src/nsXULAttributes.cpp +++ b/mozilla/rdf/content/src/nsXULAttributes.cpp @@ -141,11 +141,11 @@ nsXULAttribute::nsXULAttribute(nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aName, const nsString& aValue) - : mNameSpaceID(aNameSpaceID), + : mContent(aContent), + mScriptObject(nsnull), + mNameSpaceID(aNameSpaceID), mName(aName), - mValue(nsnull), - mContent(aContent), - mScriptObject(nsnull) + mValue(nsnull) { NS_INIT_REFCNT(); NS_IF_ADDREF(aName); diff --git a/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp b/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp index 6ec7fb9ca96..adc230d6d11 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp @@ -264,8 +264,8 @@ nsProxyEventObject::GetNewOrUsedProxy(nsIEventQueue *destQueue, } nsProxyEventObject::nsProxyEventObject() -: mNext(nsnull), - mHashKey("") +: mHashKey(""), + mNext(nsnull) { NS_WARNING("This constructor should never be called"); } @@ -276,8 +276,8 @@ nsProxyEventObject::nsProxyEventObject(nsIEventQueue *destQueue, nsProxyEventClass* aClass, nsProxyEventObject* root, const char * hashStr) - : mNext(nsnull), - mHashKey(hashStr) + : mHashKey(hashStr), + mNext(nsnull) { NS_INIT_REFCNT();