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

Bug 348748 - Remove casts from java/. r=bsmedberg on the script, a=NPOTB+no-functionality-change

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@233910 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jwalden%mit.edu
2007-09-05 07:25:16 +00:00
parent 7303269435
commit 3cb05eec64
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/java/pluggable-jvm/wf_moz6/src/nsAppletHTMLObject.cpp
View File

@@ -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<nsISupports*>(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<nsISupports*>(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<nsISupports*>(inst),
PROXY_SYNC | PROXY_ALWAYS,
getter_AddRefs(instProxy));
if (NS_FAILED(rv)) return rv;

8
mozilla/java/pluggable-jvm/wf_moz6/src/nsJavaHTMLObjectFactory.cpp
View File

@@ -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<nsISupports*>(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<nsISupports*>(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<jthrowable>(m_env->NewGlobalRef(jException));
// Release local ref
m_env->DeleteLocalRef(jException);
}

6
mozilla/java/plugins/mozilla/nsScriptablePeer.cpp
View File

@@ -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<nsISimplePlugin*>(this);
AddRef();
return NS_OK;
}
if(aIID.Equals(kIClassInfoIID)) {
*aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this);
*aInstancePtr = static_cast<nsIClassInfo*>(this);
AddRef();
return NS_OK;
}
if(aIID.Equals(kISupportsIID)) {
*aInstancePtr = NS_STATIC_CAST(nsISupports*,(NS_STATIC_CAST(nsISimplePlugin*, this)));
*aInstancePtr = static_cast<nsISupports*>((static_cast<nsISimplePlugin*>(this)));
AddRef();
return NS_OK;
}

2
mozilla/java/webclient/src_moz/CurrentPageImpl.cpp
View File

@@ -516,7 +516,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPa
loadCompleteListener->Init(nativeBrowserControl);
nsCOMPtr<nsISupports> loadCompleteGuard =
NS_STATIC_CAST(nsIWebProgressListener *, loadCompleteListener);
static_cast<nsIWebProgressListener *>(loadCompleteListener);
nsCOMPtr<nsISupportsWeakReference> supportsWeak;
supportsWeak = do_QueryInterface(loadCompleteGuard);
nsCOMPtr<nsIWeakReference> weakRef;

2
mozilla/java/webclient/src_moz/EmbedProgress.cpp
View File

@@ -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<void *>(aRequest),
aState);
**********/
return NS_OK;

10
mozilla/java/webclient/src_moz/EmbedWindow.cpp
View File

@@ -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<nsIWebBrowserChrome *>(this));
nsCOMPtr<nsIDocShellTreeItem> 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<void *>(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<PRUnichar*>(data);
PRInt32 plainTextLen = 0;
nsPrimitiveHelpers_ConvertUnicodeToPlatformPlainText ( castedUnicode, len / 2, &plainTextData, &plainTextLen );
@@ -997,8 +997,8 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords,
nsCOMPtr<nsIWidget> mainWidget;
mBaseWindow->GetMainWidget(getter_AddRefs(mainWidget));
GdkWindow *window;
window = NS_STATIC_CAST(GdkWindow *,
mainWidget->GetNativeData(NS_NATIVE_WINDOW));
window = static_cast<GdkWindow *>
(mainWidget->GetNativeData(NS_NATIVE_WINDOW));
gint root_x, root_y;
gdk_window_get_origin(window, &root_x, &root_y);

20
mozilla/java/webclient/src_moz/NativeBrowserControl.cpp
View File

@@ -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<nsIWebBrowserChrome *>(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<nsIWebProgressListener *>
(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<nsISupports *>(static_cast<nsIDOMKeyListener *>
(mEventListener));
mEventListener->Init(this);
nsCOMPtr<nsIWebBrowser> webBrowser;
@@ -117,7 +117,7 @@ NativeBrowserControl::Init(NativeWrapperFactory *yourWrapperFactory)
// create the WindowCreator: see
WindowCreator *creator = new WindowCreator(this);
nsCOMPtr<nsIWindowCreator> windowCreator;
windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator);
windowCreator = static_cast<nsIWindowCreator *>(creator);
// Attach it via the watcher service
nsCOMPtr<nsIWindowWatcher> 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<nsIDOMEventListener *>
(static_cast<nsIDOMKeyListener *>(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<nsIDOMEventListener *>
(static_cast<nsIDOMKeyListener *>(mEventListener));
nsresult rv;
rv = mEventReceiver->RemoveEventListenerByIID(eventListener,

2
mozilla/java/webclient/src_moz/NativeEventThread.cpp
View File

@@ -312,7 +312,7 @@ nsresult InitializeWindowCreator(NativeBrowserControl * nativeBrowserControl)
gCreatorCallback = new WindowCreator(nativeBrowserControl);
if (gCreatorCallback)
{
nsCOMPtr<nsIWindowCreator> windowCreator(NS_STATIC_CAST(nsIWindowCreator *, gCreatorCallback));
nsCOMPtr<nsIWindowCreator> windowCreator(static_cast<nsIWindowCreator *>(gCreatorCallback));
if (windowCreator)
{
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));

2
mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp
View File

@@ -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<nsIWebProgressListener*>(browserContainer))));
webBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));