Missed these with checkin for 98349.

embedding/browser/powerplant/source/CThrobber.cpp

@@ -193,13 +193,6 @@ void CThrobber::DrawSelf()
 }
 
 
-void CThrobber::AdjustCursorSelf(Point				/* inPortPt */,
-	                              const EventRecord&	/* inMacEvent */)
-{
-   // Overridden to do nothing - Cursor handling is done by HandleThrobberEvent
-}
-
-
 void CThrobber::ResizeFrameBy(SInt16		inWidthDelta,
                 					SInt16		inHeightDelta,
                 					Boolean	   inRefresh)

modules/libpref/src/mac/macpref.cp

@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "xp_core.h"
-#include "prefapi.h"
-#include "jsapi.h"
-#include "prlink.h"
-
-#include "MacPrefUtils.h"
-
-#ifndef __MEMORY__
-#include <Memory.h>
-#endif
-#ifndef __ALIASES__
-#include <Aliases.h>
-#endif
-#ifndef __CODEFRAGMENTS__
-#include <CodeFragments.h>
-#endif
-#ifndef __RESOURCES__
-#include <Resources.h>
-#endif
-
-
-/*
- * Mac-specific libpref routines
- */
-
-
-//----------------------------------------------------------------------------------------
-PR_IMPLEMENT(PrefResult)
-PREF_CopyPathPref(const char *pref_name, char ** return_buffer, PRBool isDefault)
-// Convert between cross-platform file/folder pathname strings
-// and Mac aliases flattened into binary strings
-//----------------------------------------------------------------------------------------
-{
-	int dirSize;
-	char *dirAliasBuf = NULL;
-	PrefResult result = PREF_CopyBinaryPref(pref_name, &dirAliasBuf, &dirSize, isDefault);
-	if (result != PREF_NOERROR)
-		return result;
-
-	// Cast to an alias record and resolve.
-	AliasHandle aliasH = NULL;
-	OSErr err = PtrToHand(dirAliasBuf, &(Handle) aliasH, dirSize);
-	free(dirAliasBuf);
-	if (err != noErr)
-		return PREF_ERROR; // not enough memory?
-
-	FSSpec fileSpec;
-	Boolean changed;
-	err = ::ResolveAlias(NULL, aliasH, &fileSpec, &changed);
-	DisposeHandle((Handle) aliasH);
-	if (err != noErr)
-		return PREF_ERROR; // bad alias
-		
-	*return_buffer = EncodedPathNameFromFSSpec(fileSpec, TRUE);
-	
-	return PREF_NOERROR;
-}
-
-//----------------------------------------------------------------------------------------
-PR_IMPLEMENT(PrefResult)
-PREF_SetPathPref(const char *pref_name, const char *path, PRBool set_default)
-//----------------------------------------------------------------------------------------
-{
-	FSSpec fileSpec;
-	AliasHandle	aliasH;
-	OSErr err = FSSpecFromLocalUnixPath(path, &fileSpec);
-	if (err != noErr)
-		return PREF_ERROR;
-
-	err = NewAlias(nil, &fileSpec, &aliasH);
-	if (err != noErr)
-		return PREF_ERROR;
-
-	PrefResult result;
-	Size bytes = GetHandleSize((Handle) aliasH);
-	HLock((Handle) aliasH);
-	
-	if (set_default)
-		result = PREF_SetDefaultBinaryPref(pref_name, *aliasH, bytes);
-	else
-		result = PREF_SetBinaryPref(pref_name, *aliasH, bytes);
-	DisposeHandle((Handle) aliasH);
-
-	return result;
-}
-
-//----------------------------------------------------------------------------------------
-PR_IMPLEMENT(PRBool) PREF_IsAutoAdminEnabled()
-//----------------------------------------------------------------------------------------
-{
-	return PR_FALSE;
-}

plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp

@@ -2022,7 +2022,7 @@ CPluginManager::GetService(const nsCID& aClass, const nsIID& aIID,
 			mLiveconnect = new nsLiveconnect;
 			NS_IF_ADDREF(mLiveconnect);
 		}
-		return mLiveconnect->QueryInterface(aIID, result);
+		return mLiveconnect->QueryInterface(aIID, (void**)result);
 	}
 	return NS_ERROR_SERVICE_NOT_FOUND;
 }

plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp

@@ -65,7 +65,7 @@ NS_METHOD EmbeddedFramePluginInstance::Initialize(nsIPluginInstancePeer* peer)
 	NS_ADDREF(mPeer);
 
 	nsIPluginTagInfo* tagInfo = NULL;
-	if (mPeer->QueryInterface(NS_GET_IID(nsIPluginTagInfo), &tagInfo) == NS_OK) {
+	if (mPeer->QueryInterface(NS_GET_IID(nsIPluginTagInfo), (void **)&tagInfo) == NS_OK) {
 		const char* frameValue = NULL;
 		if (tagInfo->GetAttribute("JAVAFRAME", &frameValue) == NS_OK) {
 			sscanf(frameValue, "%X", &mFrame);