From 3cb05eec64b66222da13811ec4fed3ca60270fbd Mon Sep 17 00:00:00 2001 From: "jwalden%mit.edu" Date: Wed, 5 Sep 2007 07:25:16 +0000 Subject: [PATCH] Bug 348748 - Remove casts from java/. r=bsmedberg on the script, a=NPOTB+no-functionality-change git-svn-id: svn://10.0.0.236/trunk@233910 18797224-902f-48f8-a5cc-f745e15eee43 --- .../wf_moz6/src/nsAppletHTMLObject.cpp | 8 ++++---- .../wf_moz6/src/nsJavaHTMLObjectFactory.cpp | 8 ++++---- .../java/plugins/mozilla/nsScriptablePeer.cpp | 6 +++--- .../webclient/src_moz/CurrentPageImpl.cpp | 2 +- .../java/webclient/src_moz/EmbedProgress.cpp | 2 +- .../java/webclient/src_moz/EmbedWindow.cpp | 10 +++++----- .../src_moz/NativeBrowserControl.cpp | 20 +++++++++---------- .../webclient/src_moz/NativeEventThread.cpp | 2 +- .../src_moz/NativeEventThreadActionEvents.cpp | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/mozilla/java/pluggable-jvm/wf_moz6/src/nsAppletHTMLObject.cpp b/mozilla/java/pluggable-jvm/wf_moz6/src/nsAppletHTMLObject.cpp index 9010cf23393..05f7aa98d6d 100644 --- a/mozilla/java/pluggable-jvm/wf_moz6/src/nsAppletHTMLObject.cpp +++ b/mozilla/java/pluggable-jvm/wf_moz6/src/nsAppletHTMLObject.cpp @@ -16,7 +16,7 @@ * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. * - * $Id: nsAppletHTMLObject.cpp,v 1.3 2001-08-03 00:43:47 edburns%acm.org Exp $ + * $Id: nsAppletHTMLObject.cpp,v 1.4 2007-09-05 07:25:16 jwalden%mit.edu Exp $ * * * Contributor(s): @@ -353,7 +353,7 @@ nsAppletHTMLObject::ShowStatus(const char* status) rv = proxyObjectManager-> GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIJavaPluginInstanceProxy), - NS_STATIC_CAST(nsISupports*, inst), + static_cast(inst), PROXY_ASYNC | PROXY_ALWAYS, getter_AddRefs(instProxy)); if (NS_FAILED(rv)) return rv; @@ -381,7 +381,7 @@ nsAppletHTMLObject::ShowDocument(const char* url, rv = proxyObjectManager-> GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIJavaPluginInstanceProxy), - NS_STATIC_CAST(nsISupports*, inst), + static_cast(inst), PROXY_SYNC | PROXY_ALWAYS, getter_AddRefs(instProxy)); if (NS_FAILED(rv)) return rv; @@ -409,7 +409,7 @@ nsAppletHTMLObject::GetJSThread(jint* jstid) rv = proxyObjectManager-> GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIJavaPluginInstanceProxy), - NS_STATIC_CAST(nsISupports*, inst), + static_cast(inst), PROXY_SYNC | PROXY_ALWAYS, getter_AddRefs(instProxy)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/java/pluggable-jvm/wf_moz6/src/nsJavaHTMLObjectFactory.cpp b/mozilla/java/pluggable-jvm/wf_moz6/src/nsJavaHTMLObjectFactory.cpp index 38c3abe8403..f33d2883cda 100644 --- a/mozilla/java/pluggable-jvm/wf_moz6/src/nsJavaHTMLObjectFactory.cpp +++ b/mozilla/java/pluggable-jvm/wf_moz6/src/nsJavaHTMLObjectFactory.cpp @@ -16,7 +16,7 @@ * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. * - * $Id: nsJavaHTMLObjectFactory.cpp,v 1.3 2001-08-03 00:43:47 edburns%acm.org Exp $ + * $Id: nsJavaHTMLObjectFactory.cpp,v 1.4 2007-09-05 07:25:16 jwalden%mit.edu Exp $ * * * Contributor(s): @@ -388,7 +388,7 @@ nsJavaHTMLObjectFactory::GetProxyForURL(const char *url, char **proxy) rv = proxyObjectManager-> GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIJavaPluginProxy), - NS_STATIC_CAST(nsISupports*, inst), + static_cast(inst), PROXY_SYNC | PROXY_ALWAYS, getter_AddRefs(instProxy)); if (NS_FAILED(rv)) return rv; @@ -415,7 +415,7 @@ nsJavaHTMLObjectFactory::JSCall(jint jstid, struct JSObject_CallInfo** call) rv = proxyObjectManager-> GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIJavaPluginProxy), - NS_STATIC_CAST(nsISupports*, inst), + static_cast(inst), PROXY_SYNC | PROXY_ALWAYS, getter_AddRefs(instProxy)); if (NS_FAILED(rv)) return rv; @@ -641,7 +641,7 @@ nsJavaHTMLObjectFactory::doJSCall(jint jstid, struct JSObject_CallInfo** call) // Store the exception in JSObject_CallInfo (*call)->jException = - NS_STATIC_CAST(jthrowable, m_env->NewGlobalRef(jException)); + static_cast(m_env->NewGlobalRef(jException)); // Release local ref m_env->DeleteLocalRef(jException); } diff --git a/mozilla/java/plugins/mozilla/nsScriptablePeer.cpp b/mozilla/java/plugins/mozilla/nsScriptablePeer.cpp index 58e0c1c9d6b..18c41c4a0ba 100644 --- a/mozilla/java/plugins/mozilla/nsScriptablePeer.cpp +++ b/mozilla/java/plugins/mozilla/nsScriptablePeer.cpp @@ -87,19 +87,19 @@ NS_IMETHODIMP nsScriptablePeer::QueryInterface(const nsIID& aIID, void** aInstan return NS_ERROR_NULL_POINTER; if(aIID.Equals(kISimplePluginIID)) { - *aInstancePtr = NS_STATIC_CAST(nsISimplePlugin*, this); + *aInstancePtr = static_cast(this); AddRef(); return NS_OK; } if(aIID.Equals(kIClassInfoIID)) { - *aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this); + *aInstancePtr = static_cast(this); AddRef(); return NS_OK; } if(aIID.Equals(kISupportsIID)) { - *aInstancePtr = NS_STATIC_CAST(nsISupports*,(NS_STATIC_CAST(nsISimplePlugin*, this))); + *aInstancePtr = static_cast((static_cast(this))); AddRef(); return NS_OK; } diff --git a/mozilla/java/webclient/src_moz/CurrentPageImpl.cpp b/mozilla/java/webclient/src_moz/CurrentPageImpl.cpp index b315d0cf035..8dcecfa3dc8 100644 --- a/mozilla/java/webclient/src_moz/CurrentPageImpl.cpp +++ b/mozilla/java/webclient/src_moz/CurrentPageImpl.cpp @@ -516,7 +516,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPa loadCompleteListener->Init(nativeBrowserControl); nsCOMPtr loadCompleteGuard = - NS_STATIC_CAST(nsIWebProgressListener *, loadCompleteListener); + static_cast(loadCompleteListener); nsCOMPtr supportsWeak; supportsWeak = do_QueryInterface(loadCompleteGuard); nsCOMPtr weakRef; diff --git a/mozilla/java/webclient/src_moz/EmbedProgress.cpp b/mozilla/java/webclient/src_moz/EmbedProgress.cpp index f6aa3c70924..eec1dc91d24 100644 --- a/mozilla/java/webclient/src_moz/EmbedProgress.cpp +++ b/mozilla/java/webclient/src_moz/EmbedProgress.cpp @@ -485,7 +485,7 @@ EmbedProgress::OnSecurityChange(nsIWebProgress *aWebProgress, /************** gtk_signal_emit(GTK_OBJECT(mOwner->mOwningWidget), moz_embed_signals[SECURITY_CHANGE], - NS_STATIC_CAST(void *, aRequest), + static_cast(aRequest), aState); **********/ return NS_OK; diff --git a/mozilla/java/webclient/src_moz/EmbedWindow.cpp b/mozilla/java/webclient/src_moz/EmbedWindow.cpp index 7cad7c4c2cf..8d37bc7d788 100644 --- a/mozilla/java/webclient/src_moz/EmbedWindow.cpp +++ b/mozilla/java/webclient/src_moz/EmbedWindow.cpp @@ -99,7 +99,7 @@ EmbedWindow::Init(NativeBrowserControl *aOwner) if (!mWebBrowser) return NS_ERROR_FAILURE; - mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, this)); + mWebBrowser->SetContainerWindow(static_cast(this)); nsCOMPtr item = do_QueryInterface(mWebBrowser); item->SetItemType(nsIDocShellTreeItem::typeContentWrapper); @@ -724,7 +724,7 @@ EmbedWindow::GetSiteWindow(void **aSiteWindow) HWND ownerAsWidget = mOwner->parentHWnd; #endif - *aSiteWindow = NS_STATIC_CAST(void *, ownerAsWidget); + *aSiteWindow = static_cast(ownerAsWidget); return NS_OK; } @@ -935,7 +935,7 @@ EmbedWindow::GetText(JNIEnv *env, // Someone is asking for text/plain; convert the unicode (assuming it's present) // to text with the correct platform encoding. char* plainTextData = nsnull; - PRUnichar* castedUnicode = NS_REINTERPRET_CAST(PRUnichar*, data); + PRUnichar* castedUnicode = reinterpret_cast(data); PRInt32 plainTextLen = 0; nsPrimitiveHelpers_ConvertUnicodeToPlatformPlainText ( castedUnicode, len / 2, &plainTextData, &plainTextLen ); @@ -997,8 +997,8 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, nsCOMPtr mainWidget; mBaseWindow->GetMainWidget(getter_AddRefs(mainWidget)); GdkWindow *window; - window = NS_STATIC_CAST(GdkWindow *, - mainWidget->GetNativeData(NS_NATIVE_WINDOW)); + window = static_cast + (mainWidget->GetNativeData(NS_NATIVE_WINDOW)); gint root_x, root_y; gdk_window_get_origin(window, &root_x, &root_y); diff --git a/mozilla/java/webclient/src_moz/NativeBrowserControl.cpp b/mozilla/java/webclient/src_moz/NativeBrowserControl.cpp index aab05b36f6f..bfd45241f7e 100644 --- a/mozilla/java/webclient/src_moz/NativeBrowserControl.cpp +++ b/mozilla/java/webclient/src_moz/NativeBrowserControl.cpp @@ -87,23 +87,23 @@ NativeBrowserControl::Init(NativeWrapperFactory *yourWrapperFactory) // initialize it. It is assumed that this window will be destroyed // when we go out of scope. mWindow = new EmbedWindow(); - mWindowGuard = NS_STATIC_CAST(nsIWebBrowserChrome *, mWindow); + mWindowGuard = static_cast(mWindow); mWindow->Init(this); // Create our progress listener object, make an owning reference, // and initialize it. It is assumed that this progress listener // will be destroyed when we go out of scope. mProgress = new EmbedProgress(); - mProgressGuard = NS_STATIC_CAST(nsIWebProgressListener *, - mProgress); + mProgressGuard = static_cast + (mProgress); mProgress->Init(this); // Create our key listener object and initialize it. It is assumed // that this will be destroyed before we go out of scope. mEventListener = new EmbedEventListener(); mEventListenerGuard = - NS_STATIC_CAST(nsISupports *, NS_STATIC_CAST(nsIDOMKeyListener *, - mEventListener)); + static_cast(static_cast + (mEventListener)); mEventListener->Init(this); nsCOMPtr webBrowser; @@ -117,7 +117,7 @@ NativeBrowserControl::Init(NativeWrapperFactory *yourWrapperFactory) // create the WindowCreator: see WindowCreator *creator = new WindowCreator(this); nsCOMPtr windowCreator; - windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator); + windowCreator = static_cast(creator); // Attach it via the watcher service nsCOMPtr watcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID); @@ -414,8 +414,8 @@ NativeBrowserControl::AttachListeners() } nsIDOMEventListener *eventListener = - NS_STATIC_CAST(nsIDOMEventListener *, - NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener)); + static_cast + (static_cast(mEventListener)); // add the key listener nsresult rv; @@ -445,8 +445,8 @@ NativeBrowserControl::DetachListeners() } nsIDOMEventListener *eventListener = - NS_STATIC_CAST(nsIDOMEventListener *, - NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener)); + static_cast + (static_cast(mEventListener)); nsresult rv; rv = mEventReceiver->RemoveEventListenerByIID(eventListener, diff --git a/mozilla/java/webclient/src_moz/NativeEventThread.cpp b/mozilla/java/webclient/src_moz/NativeEventThread.cpp index 0a1ffc92780..590991f4997 100644 --- a/mozilla/java/webclient/src_moz/NativeEventThread.cpp +++ b/mozilla/java/webclient/src_moz/NativeEventThread.cpp @@ -312,7 +312,7 @@ nsresult InitializeWindowCreator(NativeBrowserControl * nativeBrowserControl) gCreatorCallback = new WindowCreator(nativeBrowserControl); if (gCreatorCallback) { - nsCOMPtr windowCreator(NS_STATIC_CAST(nsIWindowCreator *, gCreatorCallback)); + nsCOMPtr windowCreator(static_cast(gCreatorCallback)); if (windowCreator) { nsCOMPtr wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)); diff --git a/mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp b/mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp index d2ad6ea16ae..3851f89cc6f 100644 --- a/mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp +++ b/mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp @@ -123,7 +123,7 @@ wsRealizeBrowserEvent::handleEvent () // set the docloaderobserver PENDING(edburns): how to we make our // presence as a nsIWebProgressListener know?n nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, browserContainer)))); + dont_AddRef(NS_GetWeakReference(static_cast(browserContainer)))); webBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));