rename Cancel() to DoCancel so we don't over-write method from base class (which we will be doing

when the protocol inherits from nsIChannel).

mailnews/news/src/nsNNTPProtocol.cpp

@@ -3741,7 +3741,7 @@ PRBool nsNNTPProtocol::CheckIfAuthor(nsISupports *aElement, void *data)
     }          
 }
 
-PRInt32 nsNNTPProtocol::Cancel()
+PRInt32 nsNNTPProtocol::DoCancel()
 {
     int status = 0;
     nsresult rv = NS_OK;
@@ -4725,7 +4725,7 @@ nsresult nsNNTPProtocol::ProcessProtocolState(nsIURI * url, nsIInputStream * inp
 		        break;
 
             case NEWS_DO_CANCEL:
-		        status = Cancel();
+		        status = DoCancel();
 		        break;
 
 			// XPAT

mailnews/news/src/nsNNTPProtocol.h

@@ -342,7 +342,7 @@ private:
 
 	// Canceling
 	PRInt32 StartCancel();
-	PRInt32 Cancel();
+	PRInt32 DoCancel();
 
 	// XPAT 
 	PRInt32 XPATSend();