From 06c7c1b2b4aef2ae06b8571e198d1f8c1d8384bf Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Mon, 8 Sep 2003 00:31:50 +0000 Subject: [PATCH] Fix build on gcc 3.4 by removing extra semicolons (bug 218551). r/sr=dbaron, a=brendan. --- view/src/nsViewManager.cpp | 2 +- webshell/tests/viewer/nsBrowserWindow.cpp | 2 +- webshell/tests/viewer/nsViewerApp.cpp | 2 +- webshell/tests/viewer/nsXPBaseWindow.cpp | 4 ++-- widget/src/cocoa/nsChildView.mm | 2 +- widget/src/cocoa/nsCocoaWindow.mm | 2 +- widget/src/cocoa/nsNativeScrollbar.mm | 2 +- widget/src/cocoa/nsToolkit.mm | 2 +- widget/src/gtk/nsClipboard.cpp | 2 +- widget/src/gtk/nsSound.cpp | 2 +- widget/src/gtk2/nsSound.cpp | 2 +- widget/src/mac/nsButton.cpp | 4 ++-- widget/src/mac/nsCheckButton.cpp | 4 ++-- widget/src/mac/nsDragHelperService.cpp | 2 +- widget/src/mac/nsLabel.cpp | 4 ++-- widget/src/mac/nsMacWindow.cpp | 2 +- widget/src/mac/nsMenu.cpp | 2 +- widget/src/mac/nsNativeScrollbar.cpp | 2 +- widget/src/mac/nsSound.cpp | 8 +++---- widget/src/mac/nsTextWidget.cpp | 4 ++-- widget/src/mac/nsToolkit.cpp | 2 +- widget/src/mac/nsWindow.cpp | 2 +- widget/src/photon/nsClipboard.cpp | 2 +- widget/src/photon/nsSound.cpp | 2 +- widget/src/photon/nsToolkit.cpp | 2 +- widget/src/xlib/nsSound.cpp | 2 +- widget/src/xpwidgets/nsBaseClipboard.cpp | 2 +- widget/src/xpwidgets/nsClipboardHelper.cpp | 4 ++-- widget/src/xremoteclient/XRemoteClient.cpp | 2 +- .../xremoteclient/XRemoteClientFactory.cpp | 2 +- xpcom/base/nsConsoleMessage.cpp | 4 ++-- xpcom/base/nsConsoleService.cpp | 2 +- xpcom/build/nsXPComInit.cpp | 22 +++++++++---------- xpcom/components/nsCategoryManager.cpp | 4 ++-- xpcom/components/nsComponentManager.cpp | 10 ++++----- xpcom/components/nsNativeComponentLoader.cpp | 2 +- xpcom/components/nsStaticComponentLoader.cpp | 2 +- xpcom/ds/nsProperties.cpp | 2 +- xpcom/ds/nsRecyclingAllocator.cpp | 2 +- xpcom/ds/nsStringService.cpp | 2 +- xpcom/io/nsLocalFileWin.cpp | 2 +- xpcom/io/nsMultiplexInputStream.cpp | 2 +- xpcom/io/nsScriptableInputStream.cpp | 2 +- xpcom/io/nsStringStream.cpp | 2 +- xpcom/obsolete/component/nsRegistry.cpp | 4 ++-- xpcom/proxy/src/nsProxyEventObject.cpp | 2 +- xpcom/reflect/xptinfo/src/xptiMisc.cpp | 2 +- xpcom/sample/nsSample.cpp | 2 +- xpcom/tests/TestObserverService.cpp | 2 +- xpcom/tests/TestPipes.cpp | 6 ++--- xpcom/tests/TestThreads.cpp | 6 ++--- xpcom/tests/dynamic/TestDynamic.cpp | 4 ++-- xpcom/tests/services/MyService.cpp | 2 +- xpfe/appshell/src/nsAppShellFactory.cpp | 10 ++++----- .../src/nsAppShellWindowEnumerator.cpp | 6 ++--- xpfe/appshell/src/nsCommandLineService.cpp | 2 +- xpfe/appshell/src/nsContentTreeOwner.cpp | 4 ++-- xpfe/appshell/src/nsUserInfoMac.cpp | 2 +- xpfe/appshell/src/nsUserInfoOS2.cpp | 2 +- xpfe/appshell/src/nsUserInfoUnix.cpp | 2 +- xpfe/appshell/src/nsUserInfoWin.cpp | 2 +- xpfe/appshell/src/nsWebShellWindow.cpp | 4 ++-- xpfe/appshell/src/nsWindowMediator.cpp | 6 ++--- xpfe/bootstrap/nsNativeAppSupportBeOS.cpp | 2 +- xpfe/bootstrap/nsNativeAppSupportForCocoa.mm | 2 +- xpfe/bootstrap/nsNativeAppSupportMac.cpp | 2 +- xpfe/browser/src/nsBrowserInstance.cpp | 6 ++--- .../components/alerts/src/nsAlertsService.cpp | 4 ++-- .../bookmarks/src/nsBookmarksService.cpp | 2 +- .../directory/nsDirectoryViewer.cpp | 4 ++-- xpfe/components/filepicker/src/nsFileView.cpp | 4 ++-- xpfe/components/find/src/nsFindService.cpp | 2 +- .../history/src/nsGlobalHistory.cpp | 2 +- xpfe/components/intl/nsCharsetMenu.cpp | 2 +- .../search/src/nsInternetSearchService.cpp | 4 ++-- .../startup/src/nsCommandLineService.cpp | 2 +- xpfe/components/startup/src/nsUserInfoMac.cpp | 2 +- xpfe/components/startup/src/nsUserInfoOS2.cpp | 2 +- .../components/startup/src/nsUserInfoUnix.cpp | 2 +- xpfe/components/startup/src/nsUserInfoWin.cpp | 2 +- xpfe/components/urlwidget/nsUrlWidget.cpp | 2 +- xpfe/components/winhooks/nsWindowsHooks.cpp | 4 ++-- .../components/xremote/src/XRemoteService.cpp | 2 +- xpinstall/src/nsInstallTrigger.cpp | 2 +- xpinstall/src/nsSoftwareUpdate.cpp | 10 ++++----- xpinstall/src/nsTopProgressNotifier.cpp | 2 +- xpinstall/src/nsUpdateNotification.cpp | 2 +- xpinstall/src/nsXPIProxy.cpp | 2 +- 88 files changed, 140 insertions(+), 140 deletions(-) diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp index 565b09562b2e..8fbbcf3c3000 100644 --- a/view/src/nsViewManager.cpp +++ b/view/src/nsViewManager.cpp @@ -407,7 +407,7 @@ nsViewManager::~nsViewManager() NS_IMPL_QUERY_INTERFACE1(nsViewManager, nsIViewManager) - NS_IMPL_ADDREF(nsViewManager); + NS_IMPL_ADDREF(nsViewManager) nsrefcnt nsViewManager::Release(void) { diff --git a/webshell/tests/viewer/nsBrowserWindow.cpp b/webshell/tests/viewer/nsBrowserWindow.cpp index 3dd68df966be..b37224d47e02 100644 --- a/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1357,7 +1357,7 @@ nsBrowserWindow::~nsBrowserWindow() } } -NS_IMPL_ISUPPORTS4(nsBrowserWindow, nsIBaseWindow, nsIInterfaceRequestor, nsIProgressEventSink, nsIWebShellContainer); +NS_IMPL_ISUPPORTS4(nsBrowserWindow, nsIBaseWindow, nsIInterfaceRequestor, nsIProgressEventSink, nsIWebShellContainer) nsresult nsBrowserWindow::GetInterface(const nsIID& aIID, diff --git a/webshell/tests/viewer/nsViewerApp.cpp b/webshell/tests/viewer/nsViewerApp.cpp index d63dd6cd40a6..2191f51a1543 100644 --- a/webshell/tests/viewer/nsViewerApp.cpp +++ b/webshell/tests/viewer/nsViewerApp.cpp @@ -219,7 +219,7 @@ public: -NS_IMPL_ISUPPORTS1(nsTestFormProcessor, nsIFormProcessor); +NS_IMPL_ISUPPORTS1(nsTestFormProcessor, nsIFormProcessor) nsTestFormProcessor::nsTestFormProcessor() { diff --git a/webshell/tests/viewer/nsXPBaseWindow.cpp b/webshell/tests/viewer/nsXPBaseWindow.cpp index 7de1a664617e..6d45c982101b 100644 --- a/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -693,8 +693,8 @@ nsXPBaseWindowFactory::QueryInterface(const nsIID &aIID, void **aResult) return NS_OK; } -NS_IMPL_ADDREF(nsXPBaseWindowFactory); -NS_IMPL_RELEASE(nsXPBaseWindowFactory); +NS_IMPL_ADDREF(nsXPBaseWindowFactory) +NS_IMPL_RELEASE(nsXPBaseWindowFactory) //---------------------------------------------------------------------- nsresult diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm index 4ff5d879b5dc..e2eb80823a4e 100644 --- a/widget/src/cocoa/nsChildView.mm +++ b/widget/src/cocoa/nsChildView.mm @@ -306,7 +306,7 @@ nsChildView::~nsChildView() } } -NS_IMPL_ISUPPORTS_INHERITED3(nsChildView, nsBaseWidget, nsIPluginWidget, nsIKBStateControl, nsIEventSink); +NS_IMPL_ISUPPORTS_INHERITED3(nsChildView, nsBaseWidget, nsIPluginWidget, nsIKBStateControl, nsIEventSink) //------------------------------------------------------------------------- // diff --git a/widget/src/cocoa/nsCocoaWindow.mm b/widget/src/cocoa/nsCocoaWindow.mm index ca9ffffd862e..17a16a059589 100644 --- a/widget/src/cocoa/nsCocoaWindow.mm +++ b/widget/src/cocoa/nsCocoaWindow.mm @@ -280,7 +280,7 @@ nsCocoaWindow :: DragReceiveHandler (WindowPtr theWindow, void *handlerRefCon, #endif -NS_IMPL_ISUPPORTS_INHERITED0(nsCocoaWindow, Inherited); +NS_IMPL_ISUPPORTS_INHERITED0(nsCocoaWindow, Inherited) //------------------------------------------------------------------------- diff --git a/widget/src/cocoa/nsNativeScrollbar.mm b/widget/src/cocoa/nsNativeScrollbar.mm index 4e0926fb5f9d..ff10e60cf05c 100644 --- a/widget/src/cocoa/nsNativeScrollbar.mm +++ b/widget/src/cocoa/nsNativeScrollbar.mm @@ -49,7 +49,7 @@ #include "nsIDOMElement.h" #include "nsIScrollbarMediator.h" -NS_IMPL_ISUPPORTS_INHERITED1(nsNativeScrollbar, nsChildView, nsINativeScrollbar); +NS_IMPL_ISUPPORTS_INHERITED1(nsNativeScrollbar, nsChildView, nsINativeScrollbar) inline void BoundsCheck(PRInt32 low, PRUint32& value, PRUint32 high) { diff --git a/widget/src/cocoa/nsToolkit.mm b/widget/src/cocoa/nsToolkit.mm index 25ee73e9bbc8..022b1897b8f8 100644 --- a/widget/src/cocoa/nsToolkit.mm +++ b/widget/src/cocoa/nsToolkit.mm @@ -234,7 +234,7 @@ static PRUintn gToolkitTLSIndex = 0; #pragma mark - -NS_IMPL_THREADSAFE_ISUPPORTS1(nsToolkit, nsIToolkit); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsToolkit, nsIToolkit) // assume we begin as the fg app diff --git a/widget/src/gtk/nsClipboard.cpp b/widget/src/gtk/nsClipboard.cpp index c7d48538aac2..2f47ea603e20 100644 --- a/widget/src/gtk/nsClipboard.cpp +++ b/widget/src/gtk/nsClipboard.cpp @@ -70,7 +70,7 @@ GtkWidget* nsClipboard::sWidget = 0; static GdkAtom GDK_SELECTION_CLIPBOARD; -NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard); +NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard) //------------------------------------------------------------------------- // diff --git a/widget/src/gtk/nsSound.cpp b/widget/src/gtk/nsSound.cpp index 7d0dbbe516f0..c17835e390d6 100644 --- a/widget/src/gtk/nsSound.cpp +++ b/widget/src/gtk/nsSound.cpp @@ -55,7 +55,7 @@ typedef int (PR_CALLBACK *EsdCloseType)(int); /* used to play the sounds from the find symbol call */ typedef int (PR_CALLBACK *EsdPlayStreamFallbackType)(int, int, const char *, const char *); -NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); +NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) //////////////////////////////////////////////////////////////////////// nsSound::nsSound() diff --git a/widget/src/gtk2/nsSound.cpp b/widget/src/gtk2/nsSound.cpp index 926ee5b2b237..259839d3e689 100644 --- a/widget/src/gtk2/nsSound.cpp +++ b/widget/src/gtk2/nsSound.cpp @@ -60,7 +60,7 @@ typedef int (PR_CALLBACK *EsdPlayStreamFallbackType) (int, const char *, const char *); -NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); +NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) //////////////////////////////////////////////////////////////////////// nsSound::nsSound() diff --git a/widget/src/mac/nsButton.cpp b/widget/src/mac/nsButton.cpp index f5adda353cd0..621bd019030f 100644 --- a/widget/src/mac/nsButton.cpp +++ b/widget/src/mac/nsButton.cpp @@ -40,8 +40,8 @@ #include #endif -NS_IMPL_ADDREF(nsButton); -NS_IMPL_RELEASE(nsButton); +NS_IMPL_ADDREF(nsButton) +NS_IMPL_RELEASE(nsButton) //------------------------------------------------------------------------- // diff --git a/widget/src/mac/nsCheckButton.cpp b/widget/src/mac/nsCheckButton.cpp index 0585ff83a0b9..7dd6c85bc9d8 100644 --- a/widget/src/mac/nsCheckButton.cpp +++ b/widget/src/mac/nsCheckButton.cpp @@ -40,8 +40,8 @@ #include #endif -NS_IMPL_ADDREF(nsCheckButton); -NS_IMPL_RELEASE(nsCheckButton); +NS_IMPL_ADDREF(nsCheckButton) +NS_IMPL_RELEASE(nsCheckButton) //------------------------------------------------------------------------- // diff --git a/widget/src/mac/nsDragHelperService.cpp b/widget/src/mac/nsDragHelperService.cpp index eaebac4e3ce1..206ef090a871 100644 --- a/widget/src/mac/nsDragHelperService.cpp +++ b/widget/src/mac/nsDragHelperService.cpp @@ -47,7 +47,7 @@ NS_IMPL_ADDREF(nsDragHelperService) NS_IMPL_RELEASE(nsDragHelperService) -NS_IMPL_QUERY_INTERFACE1(nsDragHelperService, nsIDragHelperService); +NS_IMPL_QUERY_INTERFACE1(nsDragHelperService, nsIDragHelperService) // diff --git a/widget/src/mac/nsLabel.cpp b/widget/src/mac/nsLabel.cpp index 7b4b62397c35..7a6042804e5e 100644 --- a/widget/src/mac/nsLabel.cpp +++ b/widget/src/mac/nsLabel.cpp @@ -37,8 +37,8 @@ #include "nsLabel.h" -NS_IMPL_ADDREF(nsLabel); -NS_IMPL_RELEASE(nsLabel); +NS_IMPL_ADDREF(nsLabel) +NS_IMPL_RELEASE(nsLabel) //------------------------------------------------------------------------- // diff --git a/widget/src/mac/nsMacWindow.cpp b/widget/src/mac/nsMacWindow.cpp index 3e1dc0edd5cf..0875ece00980 100644 --- a/widget/src/mac/nsMacWindow.cpp +++ b/widget/src/mac/nsMacWindow.cpp @@ -175,7 +175,7 @@ nsMacWindow :: DragReceiveHandler (WindowPtr theWindow, void *handlerRefCon, NS_IMPL_ISUPPORTS_INHERITED4(nsMacWindow, Inherited, nsIEventSink, nsPIWidgetMac, nsPIEventSinkStandalone, - nsIMacTextInputEventSink); + nsIMacTextInputEventSink) //------------------------------------------------------------------------- diff --git a/widget/src/mac/nsMenu.cpp b/widget/src/mac/nsMenu.cpp index 53f1f438b7c3..02dd1977d54e 100644 --- a/widget/src/mac/nsMenu.cpp +++ b/widget/src/mac/nsMenu.cpp @@ -117,7 +117,7 @@ public: } }; -NS_IMPL_ISUPPORTS0(nsDummyMenuItem); +NS_IMPL_ISUPPORTS0(nsDummyMenuItem) //------------------------------------------------------------------------- NS_IMPL_ISUPPORTS4(nsMenu, nsIMenu, nsIMenuListener, nsIChangeObserver, nsISupportsWeakReference) diff --git a/widget/src/mac/nsNativeScrollbar.cpp b/widget/src/mac/nsNativeScrollbar.cpp index 7a293d7e1435..3f86382f140d 100644 --- a/widget/src/mac/nsNativeScrollbar.cpp +++ b/widget/src/mac/nsNativeScrollbar.cpp @@ -95,7 +95,7 @@ ScrollbarActionProc ( ) } -NS_IMPL_ISUPPORTS_INHERITED1(nsNativeScrollbar, nsWindow, nsINativeScrollbar); +NS_IMPL_ISUPPORTS_INHERITED1(nsNativeScrollbar, nsWindow, nsINativeScrollbar) nsNativeScrollbar::nsNativeScrollbar() : nsMacControl() diff --git a/widget/src/mac/nsSound.cpp b/widget/src/mac/nsSound.cpp index 99f8967d2ede..2832a275ef7f 100644 --- a/widget/src/mac/nsSound.cpp +++ b/widget/src/mac/nsSound.cpp @@ -213,7 +213,7 @@ nsSound::~nsSound() #endif } -NS_IMPL_ISUPPORTS1(nsSound, nsISound); +NS_IMPL_ISUPPORTS1(nsSound, nsISound) NS_METHOD nsSound::Beep() @@ -465,7 +465,7 @@ nsSoundRequest::~nsSoundRequest() { } -NS_IMPL_ISUPPORTS1(nsSoundRequest, nsITimerCallback); +NS_IMPL_ISUPPORTS1(nsSoundRequest, nsITimerCallback) nsSoundRequest* nsSoundRequest::GetFromISupports(nsISupports* inSupports) @@ -542,7 +542,7 @@ nsSystemSoundRequest::~nsSystemSoundRequest() #endif } -NS_IMPL_ISUPPORTS_INHERITED0(nsSystemSoundRequest, nsSoundRequest); +NS_IMPL_ISUPPORTS_INHERITED0(nsSystemSoundRequest, nsSoundRequest) nsresult nsSystemSoundRequest::Init(nsISound* aSound, ConstStr255Param aSoundName) @@ -695,7 +695,7 @@ GWorldPtr nsMoviePortOwner::GetSingletonMoviePort() } -NS_IMPL_ISUPPORTS_INHERITED1(nsMovieSoundRequest, nsSoundRequest, nsIStreamLoaderObserver); +NS_IMPL_ISUPPORTS_INHERITED1(nsMovieSoundRequest, nsSoundRequest, nsIStreamLoaderObserver) //////////////////////////////////////////////////////////////////////// nsMovieSoundRequest::nsMovieSoundRequest() diff --git a/widget/src/mac/nsTextWidget.cpp b/widget/src/mac/nsTextWidget.cpp index 52009dfe3e03..3f9ccd1a29b6 100644 --- a/widget/src/mac/nsTextWidget.cpp +++ b/widget/src/mac/nsTextWidget.cpp @@ -49,8 +49,8 @@ using std::auto_ptr; #include #endif -NS_IMPL_ADDREF(nsTextWidget); -NS_IMPL_RELEASE(nsTextWidget); +NS_IMPL_ADDREF(nsTextWidget) +NS_IMPL_RELEASE(nsTextWidget) //------------------------------------------------------------------------- diff --git a/widget/src/mac/nsToolkit.cpp b/widget/src/mac/nsToolkit.cpp index 068355589f0d..ab6e650aede8 100644 --- a/widget/src/mac/nsToolkit.cpp +++ b/widget/src/mac/nsToolkit.cpp @@ -187,7 +187,7 @@ void nsMacNSPREventQueueHandler::ProcessPLEventQueue() #pragma mark - -NS_IMPL_THREADSAFE_ISUPPORTS1(nsToolkit, nsIToolkit); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsToolkit, nsIToolkit) // assume we begin as the fg app diff --git a/widget/src/mac/nsWindow.cpp b/widget/src/mac/nsWindow.cpp index b0563acd8a5e..4b2c54509155 100644 --- a/widget/src/mac/nsWindow.cpp +++ b/widget/src/mac/nsWindow.cpp @@ -342,7 +342,7 @@ nsWindow::~nsWindow() } } -NS_IMPL_ISUPPORTS_INHERITED2(nsWindow, nsBaseWidget, nsIKBStateControl, nsIPluginWidget); +NS_IMPL_ISUPPORTS_INHERITED2(nsWindow, nsBaseWidget, nsIKBStateControl, nsIPluginWidget) //------------------------------------------------------------------------- // diff --git a/widget/src/photon/nsClipboard.cpp b/widget/src/photon/nsClipboard.cpp index 3e39ed8b5cfd..037a12fa2679 100644 --- a/widget/src/photon/nsClipboard.cpp +++ b/widget/src/photon/nsClipboard.cpp @@ -59,7 +59,7 @@ // In general, a bad idea (see http://www.jwz.org/doc/x-cut-and-paste.html) // but it might have its uses for backwards compatibility. -NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard); +NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard) #define Ph_CLIPBOARD_TYPE_MOZ_BOOKMARK "BOOK" #define Ph_CLIPBOARD_TYPE_IMAGE "IMAG" diff --git a/widget/src/photon/nsSound.cpp b/widget/src/photon/nsSound.cpp index adbe9e34dd32..a9115cac9c67 100644 --- a/widget/src/photon/nsSound.cpp +++ b/widget/src/photon/nsSound.cpp @@ -50,7 +50,7 @@ #include #include "nsPhWidgetLog.h" -NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); +NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) //////////////////////////////////////////////////////////////////////// nsSound::nsSound() diff --git a/widget/src/photon/nsToolkit.cpp b/widget/src/photon/nsToolkit.cpp index 21d3612cf26b..2ee325681779 100644 --- a/widget/src/photon/nsToolkit.cpp +++ b/widget/src/photon/nsToolkit.cpp @@ -49,7 +49,7 @@ PRBool nsToolkit::mPtInited = PR_FALSE; // static PRUintn gToolkitTLSIndex = 0; -NS_IMPL_ISUPPORTS1(nsToolkit,nsIToolkit); +NS_IMPL_ISUPPORTS1(nsToolkit,nsIToolkit) //------------------------------------------------------------------------- // diff --git a/widget/src/xlib/nsSound.cpp b/widget/src/xlib/nsSound.cpp index 1674c6ea749d..7d90dd01c017 100644 --- a/widget/src/xlib/nsSound.cpp +++ b/widget/src/xlib/nsSound.cpp @@ -37,7 +37,7 @@ #include -NS_IMPL_THREADSAFE_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); +NS_IMPL_THREADSAFE_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) //////////////////////////////////////////////////////////////////////// nsSound::nsSound() diff --git a/widget/src/xpwidgets/nsBaseClipboard.cpp b/widget/src/xpwidgets/nsBaseClipboard.cpp index 1efa10a48130..4a7923dd4833 100644 --- a/widget/src/xpwidgets/nsBaseClipboard.cpp +++ b/widget/src/xpwidgets/nsBaseClipboard.cpp @@ -49,7 +49,7 @@ NS_IMPL_ADDREF(nsBaseClipboard) NS_IMPL_RELEASE(nsBaseClipboard) -NS_IMPL_QUERY_INTERFACE1(nsBaseClipboard, nsIClipboard); +NS_IMPL_QUERY_INTERFACE1(nsBaseClipboard, nsIClipboard) //------------------------------------------------------------------------- diff --git a/widget/src/xpwidgets/nsClipboardHelper.cpp b/widget/src/xpwidgets/nsClipboardHelper.cpp index 7bf5a46c363b..7ed4ded8f497 100644 --- a/widget/src/xpwidgets/nsClipboardHelper.cpp +++ b/widget/src/xpwidgets/nsClipboardHelper.cpp @@ -36,7 +36,7 @@ #include "nsITransferable.h" #include "nsReadableUtils.h" -NS_IMPL_ISUPPORTS1(nsClipboardHelper, nsIClipboardHelper); +NS_IMPL_ISUPPORTS1(nsClipboardHelper, nsIClipboardHelper) /***************************************************************************** * nsClipboardHelper ctor / dtor @@ -49,7 +49,7 @@ nsClipboardHelper::nsClipboardHelper() nsClipboardHelper::~nsClipboardHelper() { // no members, nothing to destroy -}; +} /***************************************************************************** * nsIClipboardHelper methods diff --git a/widget/src/xremoteclient/XRemoteClient.cpp b/widget/src/xremoteclient/XRemoteClient.cpp index af7186598e72..d1c60de5cedb 100644 --- a/widget/src/xremoteclient/XRemoteClient.cpp +++ b/widget/src/xremoteclient/XRemoteClient.cpp @@ -70,7 +70,7 @@ XRemoteClient::~XRemoteClient() } #ifndef XREMOTE_STANDALONE -NS_IMPL_ISUPPORTS1(XRemoteClient, nsIXRemoteClient); +NS_IMPL_ISUPPORTS1(XRemoteClient, nsIXRemoteClient) #endif NS_IMETHODIMP diff --git a/widget/src/xremoteclient/XRemoteClientFactory.cpp b/widget/src/xremoteclient/XRemoteClientFactory.cpp index 138e31cd6071..67571ebbc5f6 100644 --- a/widget/src/xremoteclient/XRemoteClientFactory.cpp +++ b/widget/src/xremoteclient/XRemoteClientFactory.cpp @@ -57,6 +57,6 @@ static const nsModuleComponentInfo components[] = XRemoteClientConstructor } }; -NS_IMPL_NSGETMODULE(XRemoteClientModule, components); +NS_IMPL_NSGETMODULE(XRemoteClientModule, components) diff --git a/xpcom/base/nsConsoleMessage.cpp b/xpcom/base/nsConsoleMessage.cpp index a96812b9c891..095f462c46e4 100644 --- a/xpcom/base/nsConsoleMessage.cpp +++ b/xpcom/base/nsConsoleMessage.cpp @@ -42,7 +42,7 @@ #include "nsConsoleMessage.h" #include "nsReadableUtils.h" -NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleMessage, nsIConsoleMessage); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleMessage, nsIConsoleMessage) nsConsoleMessage::nsConsoleMessage() { @@ -53,7 +53,7 @@ nsConsoleMessage::nsConsoleMessage(const PRUnichar *message) mMessage.Assign(message); } -nsConsoleMessage::~nsConsoleMessage() {}; +nsConsoleMessage::~nsConsoleMessage() {} NS_IMETHODIMP nsConsoleMessage::GetMessage(PRUnichar **result) { diff --git a/xpcom/base/nsConsoleService.cpp b/xpcom/base/nsConsoleService.cpp index b362ca6bae58..05ab398ec5bb 100644 --- a/xpcom/base/nsConsoleService.cpp +++ b/xpcom/base/nsConsoleService.cpp @@ -50,7 +50,7 @@ #include "nsConsoleService.h" #include "nsConsoleMessage.h" -NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleService, nsIConsoleService); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleService, nsIConsoleService) nsConsoleService::nsConsoleService() : mCurrent(0), mFull(PR_FALSE), mListening(PR_FALSE), mLock(nsnull) diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp index fb93037806dd..469d4b79ab71 100644 --- a/xpcom/build/nsXPComInit.cpp +++ b/xpcom/build/nsXPComInit.cpp @@ -126,8 +126,8 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); static NS_DEFINE_CID(kMemoryCID, NS_MEMORY_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsProcess); -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsEventQueueServiceImpl, Init); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsProcess) +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsEventQueueServiceImpl, Init) #include "nsXPCOM.h" // ds/nsISupportsPrimitives @@ -167,21 +167,21 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSupportsDoubleImpl) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSupportsVoidImpl) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSupportsInterfacePointerImpl) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsArray); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsConsoleService); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsAtomService); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsExceptionService); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimerImpl); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimerManager); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsArray) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsConsoleService) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAtomService) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsExceptionService) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimerImpl) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimerManager) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBinaryOutputStream) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBinaryInputStream) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsVariant); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsVariant) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsRecyclingAllocatorImpl); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsRecyclingAllocatorImpl) #ifdef MOZ_TIMELINE -NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimelineService); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimelineService) #endif static NS_METHOD diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp index 61134bc47208..2bc5991a3f2e 100644 --- a/xpcom/components/nsCategoryManager.cpp +++ b/xpcom/components/nsCategoryManager.cpp @@ -107,7 +107,7 @@ protected: PRUint32 mStringCurItem; }; -NS_IMPL_ISUPPORTS2(BaseStringEnumerator, nsISimpleEnumerator, nsIUTF8StringEnumerator); +NS_IMPL_ISUPPORTS2(BaseStringEnumerator, nsISimpleEnumerator, nsIUTF8StringEnumerator) NS_IMETHODIMP BaseStringEnumerator::HasMoreElements(PRBool *_retval) @@ -440,7 +440,7 @@ CategoryEnumerator::enumfunc_createenumerator(const char* aStr, CategoryNode* aN // nsCategoryManager implementations // -NS_IMPL_THREADSAFE_ISUPPORTS1(nsCategoryManager, nsICategoryManager); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsCategoryManager, nsICategoryManager) nsCategoryManager* nsCategoryManager::Create() diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp index 9002329a0bc8..a175edeeee95 100644 --- a/xpcom/components/nsComponentManager.cpp +++ b/xpcom/components/nsComponentManager.cpp @@ -479,7 +479,7 @@ PLDHashTableEnumeratorImpl::PLDHashTableEnumeratorImpl(PLDHashTable *table, NS_IMPL_ISUPPORTS3(PLDHashTableEnumeratorImpl, nsIBidirectionalEnumerator, nsIEnumerator, - nsISimpleEnumerator); + nsISimpleEnumerator) PLDHashTableEnumeratorImpl::~PLDHashTableEnumeratorImpl() { @@ -2449,7 +2449,7 @@ nsComponentManagerImpl::GetService(const nsCID& aClass, const nsIID& aIID, nsIShutdownListener* shutdownListener) { return GetService(aClass, aIID, (void**)result); -}; +} NS_IMETHODIMP nsComponentManagerImpl::GetService(const char* aContractID, const nsIID& aIID, @@ -2457,7 +2457,7 @@ nsComponentManagerImpl::GetService(const char* aContractID, const nsIID& aIID, nsIShutdownListener* shutdownListener) { return GetServiceByContractID(aContractID, aIID, (void**)result); -}; +} NS_IMETHODIMP @@ -2466,7 +2466,7 @@ nsComponentManagerImpl::ReleaseService(const nsCID& aClass, nsISupports* service { NS_IF_RELEASE(service); return NS_OK; -}; +} NS_IMETHODIMP nsComponentManagerImpl::ReleaseService(const char* aContractID, nsISupports* service, @@ -2474,7 +2474,7 @@ nsComponentManagerImpl::ReleaseService(const char* aContractID, nsISupports* ser { NS_IF_RELEASE(service); return NS_OK; -}; +} /* * I want an efficient way to allocate a buffer to the right size diff --git a/xpcom/components/nsNativeComponentLoader.cpp b/xpcom/components/nsNativeComponentLoader.cpp index ce5c8d4cb4eb..53c7aecea176 100644 --- a/xpcom/components/nsNativeComponentLoader.cpp +++ b/xpcom/components/nsNativeComponentLoader.cpp @@ -74,7 +74,7 @@ nsNativeComponentLoader::~nsNativeComponentLoader() NS_IMPL_THREADSAFE_ISUPPORTS2(nsNativeComponentLoader, nsIComponentLoader, - nsINativeComponentLoader); + nsINativeComponentLoader) NS_IMETHODIMP nsNativeComponentLoader::GetFactory(const nsIID & aCID, diff --git a/xpcom/components/nsStaticComponentLoader.cpp b/xpcom/components/nsStaticComponentLoader.cpp index 14d3777f8dc2..7d471f7a4fbb 100644 --- a/xpcom/components/nsStaticComponentLoader.cpp +++ b/xpcom/components/nsStaticComponentLoader.cpp @@ -73,7 +73,7 @@ info_InitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) PL_DHashFinalizeStub, info_InitEntry }; -NS_IMPL_THREADSAFE_ISUPPORTS1(nsStaticComponentLoader, nsIComponentLoader); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsStaticComponentLoader, nsIComponentLoader) NS_COM NSGetStaticModuleInfoFunc NSGetStaticModuleInfo; diff --git a/xpcom/ds/nsProperties.cpp b/xpcom/ds/nsProperties.cpp index 80ccc79542dc..381466f72092 100644 --- a/xpcom/ds/nsProperties.cpp +++ b/xpcom/ds/nsProperties.cpp @@ -75,7 +75,7 @@ nsProperties::~nsProperties() Enumerate(ReleaseValues); } -NS_IMPL_AGGREGATED(nsProperties); +NS_IMPL_AGGREGATED(nsProperties) NS_METHOD nsProperties::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr) diff --git a/xpcom/ds/nsRecyclingAllocator.cpp b/xpcom/ds/nsRecyclingAllocator.cpp index f6ff79e8b359..63f87779003e 100644 --- a/xpcom/ds/nsRecyclingAllocator.cpp +++ b/xpcom/ds/nsRecyclingAllocator.cpp @@ -373,7 +373,7 @@ nsRecyclingAllocator::AddToFreeList(Block* block) // ---------------------------------------------------------------------- // nsIMemory methods -NS_IMPL_THREADSAFE_ISUPPORTS2(nsRecyclingAllocatorImpl, nsIMemory, nsIRecyclingAllocator); +NS_IMPL_THREADSAFE_ISUPPORTS2(nsRecyclingAllocatorImpl, nsIMemory, nsIRecyclingAllocator) NS_IMETHODIMP_(void *) nsRecyclingAllocatorImpl::Alloc(PRSize size) diff --git a/xpcom/ds/nsStringService.cpp b/xpcom/ds/nsStringService.cpp index 5457a7767563..9b29262ce8e5 100644 --- a/xpcom/ds/nsStringService.cpp +++ b/xpcom/ds/nsStringService.cpp @@ -48,7 +48,7 @@ nsStringService::~nsStringService() } NS_IMPL_ISUPPORTS1(nsStringService, - nsIStringService); + nsIStringService) NS_IMETHODIMP diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp index 92e6a8e6f8d9..99501e2a9a44 100644 --- a/xpcom/io/nsLocalFileWin.cpp +++ b/xpcom/io/nsLocalFileWin.cpp @@ -392,7 +392,7 @@ class nsDirEnumerator : public nsISimpleEnumerator nsCOMPtr mNext; }; -NS_IMPL_ISUPPORTS1(nsDirEnumerator, nsISimpleEnumerator); +NS_IMPL_ISUPPORTS1(nsDirEnumerator, nsISimpleEnumerator) //----------------------------------------------------------------------------- diff --git a/xpcom/io/nsMultiplexInputStream.cpp b/xpcom/io/nsMultiplexInputStream.cpp index 26d74fdaae1d..621a700a4ddc 100644 --- a/xpcom/io/nsMultiplexInputStream.cpp +++ b/xpcom/io/nsMultiplexInputStream.cpp @@ -83,7 +83,7 @@ private: NS_IMPL_THREADSAFE_ISUPPORTS3(nsMultiplexInputStream, nsIMultiplexInputStream, nsIInputStream, - nsISeekableStream); + nsISeekableStream) nsMultiplexInputStream::nsMultiplexInputStream() : mCurrentStream(0), diff --git a/xpcom/io/nsScriptableInputStream.cpp b/xpcom/io/nsScriptableInputStream.cpp index b3dc45e3435e..acc40941e55d 100644 --- a/xpcom/io/nsScriptableInputStream.cpp +++ b/xpcom/io/nsScriptableInputStream.cpp @@ -38,7 +38,7 @@ #include "nsScriptableInputStream.h" #include "nsMemory.h" -NS_IMPL_ISUPPORTS1(nsScriptableInputStream, nsIScriptableInputStream); +NS_IMPL_ISUPPORTS1(nsScriptableInputStream, nsIScriptableInputStream) // nsIBaseStream methods NS_IMETHODIMP diff --git a/xpcom/io/nsStringStream.cpp b/xpcom/io/nsStringStream.cpp index feb1ae7f9cc1..0840cd2f10ce 100644 --- a/xpcom/io/nsStringStream.cpp +++ b/xpcom/io/nsStringStream.cpp @@ -136,7 +136,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsStringInputStream, nsIStringInputStream, nsIInputStream, nsIRandomAccessStore, - nsISeekableStream); + nsISeekableStream) ///////// // nsIStringInputStream implementation diff --git a/xpcom/obsolete/component/nsRegistry.cpp b/xpcom/obsolete/component/nsRegistry.cpp index ed2641953501..7e2c6113c74a 100644 --- a/xpcom/obsolete/component/nsRegistry.cpp +++ b/xpcom/obsolete/component/nsRegistry.cpp @@ -1650,7 +1650,7 @@ NS_IMETHODIMP nsRegSubtreeEnumerator::advance() { // Convert result. nsresult rv = regerr2nsresult( err ); return rv; -}; +} /*-------------------- nsRegSubtreeEnumerator::CurrentItem --------------------- | Allocates and returns a new instance of class nsRegistryNode. The node | @@ -1748,7 +1748,7 @@ NS_IMETHODIMP nsRegValueEnumerator::advance() { // Convert result. nsresult rv = regerr2nsresult( err ); return rv; -}; +} /*---------------------- nsRegistryNode::nsRegistryNode ------------------------ diff --git a/xpcom/proxy/src/nsProxyEventObject.cpp b/xpcom/proxy/src/nsProxyEventObject.cpp index 9513c0531586..6ffc79e944f6 100644 --- a/xpcom/proxy/src/nsProxyEventObject.cpp +++ b/xpcom/proxy/src/nsProxyEventObject.cpp @@ -467,7 +467,7 @@ nsProxyEventObject::~nsProxyEventObject() // nsISupports implementation... // -NS_IMPL_THREADSAFE_ADDREF(nsProxyEventObject); +NS_IMPL_THREADSAFE_ADDREF(nsProxyEventObject) NS_IMETHODIMP_(nsrefcnt) nsProxyEventObject::Release(void) diff --git a/xpcom/reflect/xptinfo/src/xptiMisc.cpp b/xpcom/reflect/xptinfo/src/xptiMisc.cpp index 6add81a18536..9ac111fd4150 100644 --- a/xpcom/reflect/xptinfo/src/xptiMisc.cpp +++ b/xpcom/reflect/xptinfo/src/xptiMisc.cpp @@ -104,7 +104,7 @@ xptiAutoLog::xptiAutoLog(xptiInterfaceInfoManager* mgr, #endif } } -}; +} xptiAutoLog::~xptiAutoLog() { diff --git a/xpcom/sample/nsSample.cpp b/xpcom/sample/nsSample.cpp index d1ff93cf528f..3613d4457640 100644 --- a/xpcom/sample/nsSample.cpp +++ b/xpcom/sample/nsSample.cpp @@ -76,7 +76,7 @@ nsSampleImpl::~nsSampleImpl() * The _CI variant adds support for nsIClassInfo, which permits introspection * and interface flattening. */ -NS_IMPL_ISUPPORTS1_CI(nsSampleImpl, nsISample); +NS_IMPL_ISUPPORTS1_CI(nsSampleImpl, nsISample) /** * Notice that in the protoype for this function, the NS_IMETHOD macro was diff --git a/xpcom/tests/TestObserverService.cpp b/xpcom/tests/TestObserverService.cpp index 794918da9cd1..37c49d8e97d8 100644 --- a/xpcom/tests/TestObserverService.cpp +++ b/xpcom/tests/TestObserverService.cpp @@ -77,7 +77,7 @@ public: nsString mName; }; -NS_IMPL_ISUPPORTS2( TestObserver, nsIObserver, nsISupportsWeakReference ); +NS_IMPL_ISUPPORTS2( TestObserver, nsIObserver, nsISupportsWeakReference ) NS_IMETHODIMP TestObserver::Observe( nsISupports *aSubject, diff --git a/xpcom/tests/TestPipes.cpp b/xpcom/tests/TestPipes.cpp index aaef34ca731d..cb8ff64f0e5f 100644 --- a/xpcom/tests/TestPipes.cpp +++ b/xpcom/tests/TestPipes.cpp @@ -122,7 +122,7 @@ protected: PRUint32 mCount; }; -NS_IMPL_THREADSAFE_ISUPPORTS1(nsReceiver, nsIRunnable); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsReceiver, nsIRunnable) nsresult TestPipe(nsIInputStream* in, nsIOutputStream* out) @@ -234,7 +234,7 @@ protected: PRUint32 mReceived; }; -NS_IMPL_THREADSAFE_ISUPPORTS1(nsShortReader, nsIRunnable); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsShortReader, nsIRunnable) nsresult TestShortWrites(nsIInputStream* in, nsIOutputStream* out) @@ -315,7 +315,7 @@ public: virtual ~nsPipeObserver() {} }; -NS_IMPL_ISUPPORTS2(nsPipeObserver, nsIInputStreamObserver, nsIOutputStreamObserver); +NS_IMPL_ISUPPORTS2(nsPipeObserver, nsIInputStreamObserver, nsIOutputStreamObserver) nsresult TestPipeObserver() diff --git a/xpcom/tests/TestThreads.cpp b/xpcom/tests/TestThreads.cpp index e0320733452e..15eedbef385f 100644 --- a/xpcom/tests/TestThreads.cpp +++ b/xpcom/tests/TestThreads.cpp @@ -85,7 +85,7 @@ private: }; -NS_IMPL_THREADSAFE_ISUPPORTS1(nsConcurrentRunner, nsIRunnable); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsConcurrentRunner, nsIRunnable) class nsRunner : public nsIRunnable { @@ -115,7 +115,7 @@ protected: int mNum; }; -NS_IMPL_THREADSAFE_ISUPPORTS1(nsRunner, nsIRunnable); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsRunner, nsIRunnable) nsresult TestThreads() @@ -249,7 +249,7 @@ protected: PRInt32 nsStressRunner::gNum = 0; -NS_IMPL_THREADSAFE_ISUPPORTS1(nsStressRunner, nsIRunnable); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsStressRunner, nsIRunnable) static int Stress(int loops, int threads) { diff --git a/xpcom/tests/dynamic/TestDynamic.cpp b/xpcom/tests/dynamic/TestDynamic.cpp index d60134ca99db..2a5eb91ac8af 100644 --- a/xpcom/tests/dynamic/TestDynamic.cpp +++ b/xpcom/tests/dynamic/TestDynamic.cpp @@ -53,7 +53,7 @@ class TestDynamicClassImpl: public ITestClass { void Test(); }; -NS_IMPL_ISUPPORTS1(TestDynamicClassImpl, ITestClass); +NS_IMPL_ISUPPORTS1(TestDynamicClassImpl, ITestClass) void TestDynamicClassImpl::Test() { printf("hello, dynamic world!\n"); @@ -63,7 +63,7 @@ void TestDynamicClassImpl::Test() { * Generic Module */ -NS_GENERIC_FACTORY_CONSTRUCTOR(TestDynamicClassImpl); +NS_GENERIC_FACTORY_CONSTRUCTOR(TestDynamicClassImpl) static const nsModuleComponentInfo components[] = { diff --git a/xpcom/tests/services/MyService.cpp b/xpcom/tests/services/MyService.cpp index 3a02acf0b32b..cc6dd3a72b9f 100644 --- a/xpcom/tests/services/MyService.cpp +++ b/xpcom/tests/services/MyService.cpp @@ -59,7 +59,7 @@ public: //////////////////////////////////////////////////////////////////////////////// // MyService Implementation -NS_IMPL_ISUPPORTS1(MyService, IMyService); +NS_IMPL_ISUPPORTS1(MyService, IMyService) MyService::MyService() { diff --git a/xpfe/appshell/src/nsAppShellFactory.cpp b/xpfe/appshell/src/nsAppShellFactory.cpp index 421b1161351f..953f42bc1af7 100644 --- a/xpfe/appshell/src/nsAppShellFactory.cpp +++ b/xpfe/appshell/src/nsAppShellFactory.cpp @@ -56,11 +56,11 @@ /* extern the factory entry points for each component... */ nsresult NS_NewAppShellServiceFactory(nsIFactory** aFactory); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsCmdLineService); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppShellService); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowMediator); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimingService); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCmdLineService) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppShellService) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowMediator) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimingService) static const nsModuleComponentInfo gAppShellModuleInfo[] = { diff --git a/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp b/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp index 78fb5669dc40..eeede11926a6 100644 --- a/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp +++ b/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp @@ -204,7 +204,7 @@ void nsWindowInfo::ReferenceSelf(PRBool inAge, PRBool inZ) { /*********************** nsAppShellWindowEnumerator *****************/ /********************************************************************/ -NS_IMPL_ISUPPORTS1(nsAppShellWindowEnumerator, nsISimpleEnumerator); +NS_IMPL_ISUPPORTS1(nsAppShellWindowEnumerator, nsISimpleEnumerator) nsAppShellWindowEnumerator::nsAppShellWindowEnumerator ( const PRUnichar* aTypeString, @@ -275,7 +275,7 @@ NS_IMETHODIMP nsASDOMWindowEnumerator::GetNext(nsISupports **retval) { mCurrentPosition = FindNext(); } return NS_OK; -}; +} /********************************************************************/ /*********************** nsASXULWindowEnumerator ********************/ @@ -303,7 +303,7 @@ NS_IMETHODIMP nsASXULWindowEnumerator::GetNext(nsISupports **retval) { mCurrentPosition = FindNext(); } return NS_OK; -}; +} /********************************************************************/ /****************** nsASDOMWindowEarlyToLateEnumerator **************/ diff --git a/xpfe/appshell/src/nsCommandLineService.cpp b/xpfe/appshell/src/nsCommandLineService.cpp index 9367109fe60d..d287c92e8e42 100644 --- a/xpfe/appshell/src/nsCommandLineService.cpp +++ b/xpfe/appshell/src/nsCommandLineService.cpp @@ -56,7 +56,7 @@ nsCmdLineService::nsCmdLineService() /* * Implement the nsISupports methods... */ -NS_IMPL_ISUPPORTS1(nsCmdLineService, nsICmdLineService); +NS_IMPL_ISUPPORTS1(nsCmdLineService, nsICmdLineService) static void* ProcessURLArg(char* str) { diff --git a/xpfe/appshell/src/nsContentTreeOwner.cpp b/xpfe/appshell/src/nsContentTreeOwner.cpp index 2b6713318144..52a0de013cdc 100644 --- a/xpfe/appshell/src/nsContentTreeOwner.cpp +++ b/xpfe/appshell/src/nsContentTreeOwner.cpp @@ -757,8 +757,8 @@ nsSiteWindow2::~nsSiteWindow2() { } -NS_IMPL_ADDREF_USING_AGGREGATOR(nsSiteWindow2, mAggregator); -NS_IMPL_RELEASE_USING_AGGREGATOR(nsSiteWindow2, mAggregator); +NS_IMPL_ADDREF_USING_AGGREGATOR(nsSiteWindow2, mAggregator) +NS_IMPL_RELEASE_USING_AGGREGATOR(nsSiteWindow2, mAggregator) NS_INTERFACE_MAP_BEGIN(nsSiteWindow2) NS_INTERFACE_MAP_ENTRY(nsISupports) diff --git a/xpfe/appshell/src/nsUserInfoMac.cpp b/xpfe/appshell/src/nsUserInfoMac.cpp index 1506787af549..06c65305a0f9 100644 --- a/xpfe/appshell/src/nsUserInfoMac.cpp +++ b/xpfe/appshell/src/nsUserInfoMac.cpp @@ -50,7 +50,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); +NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetFullname(PRUnichar **aFullname) diff --git a/xpfe/appshell/src/nsUserInfoOS2.cpp b/xpfe/appshell/src/nsUserInfoOS2.cpp index 2f224ef8bcfe..fb6e081c1238 100644 --- a/xpfe/appshell/src/nsUserInfoOS2.cpp +++ b/xpfe/appshell/src/nsUserInfoOS2.cpp @@ -39,7 +39,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); +NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetUsername(char **aUsername) diff --git a/xpfe/appshell/src/nsUserInfoUnix.cpp b/xpfe/appshell/src/nsUserInfoUnix.cpp index 84d876e8ca67..74a5658cc8f1 100644 --- a/xpfe/appshell/src/nsUserInfoUnix.cpp +++ b/xpfe/appshell/src/nsUserInfoUnix.cpp @@ -63,7 +63,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); +NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetFullname(PRUnichar **aFullname) diff --git a/xpfe/appshell/src/nsUserInfoWin.cpp b/xpfe/appshell/src/nsUserInfoWin.cpp index 22bd3f6cb9f8..b17e241730ea 100644 --- a/xpfe/appshell/src/nsUserInfoWin.cpp +++ b/xpfe/appshell/src/nsUserInfoWin.cpp @@ -51,7 +51,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); +NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetUsername(char **aUsername) diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp index 822c4f81bc1c..5188327ff5b8 100644 --- a/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/xpfe/appshell/src/nsWebShellWindow.cpp @@ -217,8 +217,8 @@ nsWebShellWindow::~nsWebShellWindow() PR_DestroyLock(mSPTimerLock); } -NS_IMPL_THREADSAFE_ADDREF(nsWebShellWindow); -NS_IMPL_THREADSAFE_RELEASE(nsWebShellWindow); +NS_IMPL_THREADSAFE_ADDREF(nsWebShellWindow) +NS_IMPL_THREADSAFE_RELEASE(nsWebShellWindow) NS_INTERFACE_MAP_BEGIN(nsWebShellWindow) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebShellContainer) diff --git a/xpfe/appshell/src/nsWindowMediator.cpp b/xpfe/appshell/src/nsWindowMediator.cpp index efd94e61ed06..7ca7f3ffca4c 100644 --- a/xpfe/appshell/src/nsWindowMediator.cpp +++ b/xpfe/appshell/src/nsWindowMediator.cpp @@ -631,9 +631,9 @@ nsWindowMediator::SetZPosition( } // COM -NS_IMPL_ADDREF( nsWindowMediator ); -NS_IMPL_QUERY_INTERFACE1(nsWindowMediator, nsIWindowMediator); -NS_IMPL_RELEASE(nsWindowMediator); +NS_IMPL_ADDREF( nsWindowMediator ) +NS_IMPL_QUERY_INTERFACE1(nsWindowMediator, nsIWindowMediator) +NS_IMPL_RELEASE(nsWindowMediator) nsresult nsWindowMediator::Init() diff --git a/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp b/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp index aa50250ab037..0310aafc3383 100644 --- a/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp +++ b/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp @@ -87,7 +87,7 @@ nsSplashScreenBeOS::~nsSplashScreenBeOS() { Hide(); } -NS_IMPL_ISUPPORTS2(nsSplashScreenBeOS, nsISplashScreen, nsIObserver); +NS_IMPL_ISUPPORTS2(nsSplashScreenBeOS, nsISplashScreen, nsIObserver) NS_IMETHODIMP nsSplashScreenBeOS::Show() { diff --git a/xpfe/bootstrap/nsNativeAppSupportForCocoa.mm b/xpfe/bootstrap/nsNativeAppSupportForCocoa.mm index 312dfd282c2a..5b09b4571b48 100644 --- a/xpfe/bootstrap/nsNativeAppSupportForCocoa.mm +++ b/xpfe/bootstrap/nsNativeAppSupportForCocoa.mm @@ -93,7 +93,7 @@ nsSplashScreenCocoa::~nsSplashScreenCocoa() } -NS_IMPL_ISUPPORTS2(nsSplashScreenCocoa, nsISplashScreen, nsIObserver); +NS_IMPL_ISUPPORTS2(nsSplashScreenCocoa, nsISplashScreen, nsIObserver) NS_IMETHODIMP nsSplashScreenCocoa::Show() diff --git a/xpfe/bootstrap/nsNativeAppSupportMac.cpp b/xpfe/bootstrap/nsNativeAppSupportMac.cpp index 1433f2969297..48be39a25389 100644 --- a/xpfe/bootstrap/nsNativeAppSupportMac.cpp +++ b/xpfe/bootstrap/nsNativeAppSupportMac.cpp @@ -121,7 +121,7 @@ nsNativeAppSupportMac::~nsNativeAppSupportMac() HideSplashScreen(); } -NS_IMPL_ISUPPORTS2(nsNativeAppSupportMac, nsINativeAppSupport, nsIObserver); +NS_IMPL_ISUPPORTS2(nsNativeAppSupportMac, nsINativeAppSupport, nsIObserver) /* boolean start (); */ NS_IMETHODIMP nsNativeAppSupportMac::Start(PRBool *_retval) diff --git a/xpfe/browser/src/nsBrowserInstance.cpp b/xpfe/browser/src/nsBrowserInstance.cpp index 04cdf7bb160a..4141e4d717f1 100644 --- a/xpfe/browser/src/nsBrowserInstance.cpp +++ b/xpfe/browser/src/nsBrowserInstance.cpp @@ -637,8 +637,8 @@ nsBrowserInstance::Close() ///////////////////////////////////////////////////////////////////////// -NS_IMPL_ADDREF(nsBrowserContentHandler); -NS_IMPL_RELEASE(nsBrowserContentHandler); +NS_IMPL_ADDREF(nsBrowserContentHandler) +NS_IMPL_RELEASE(nsBrowserContentHandler) NS_INTERFACE_MAP_BEGIN(nsBrowserContentHandler) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContentHandler) @@ -655,7 +655,7 @@ nsBrowserContentHandler::~nsBrowserContentHandler() } CMDLINEHANDLER_OTHERS_IMPL(nsBrowserContentHandler,"-chrome","general.startup.browser","Load the specified chrome.", PR_TRUE, PR_FALSE) -CMDLINEHANDLER_REGISTERPROC_IMPL(nsBrowserContentHandler, "Browser Startup Handler", NS_BROWSERSTARTUPHANDLER_CONTRACTID); +CMDLINEHANDLER_REGISTERPROC_IMPL(nsBrowserContentHandler, "Browser Startup Handler", NS_BROWSERSTARTUPHANDLER_CONTRACTID) NS_IMETHODIMP nsBrowserContentHandler::GetChromeUrlForTask(char **aChromeUrlForTask) { if (!aChromeUrlForTask) diff --git a/xpfe/components/alerts/src/nsAlertsService.cpp b/xpfe/components/alerts/src/nsAlertsService.cpp index 513860d98002..80bf91dc2ef3 100644 --- a/xpfe/components/alerts/src/nsAlertsService.cpp +++ b/xpfe/components/alerts/src/nsAlertsService.cpp @@ -47,8 +47,8 @@ #define ALERT_CHROME_URL "chrome://communicator/content/alerts/alert.xul" -NS_IMPL_THREADSAFE_ADDREF(nsAlertsService); -NS_IMPL_THREADSAFE_RELEASE(nsAlertsService); +NS_IMPL_THREADSAFE_ADDREF(nsAlertsService) +NS_IMPL_THREADSAFE_RELEASE(nsAlertsService) NS_INTERFACE_MAP_BEGIN(nsAlertsService) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp index e8fb5d99982f..df7938a0b840 100644 --- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -2589,7 +2589,7 @@ NS_IMETHODIMP nsBookmarksService::Observe(nsISupports *aSubject, const char *aTo //////////////////////////////////////////////////////////////////////// // nsISupports methods -NS_IMPL_ADDREF(nsBookmarksService); +NS_IMPL_ADDREF(nsBookmarksService) NS_IMETHODIMP_(nsrefcnt) nsBookmarksService::Release() diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp index 1fa4ba66114c..00c71b9eed9b 100644 --- a/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/xpfe/components/directory/nsDirectoryViewer.cpp @@ -116,7 +116,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS7(nsHTTPIndex, nsIDirIndexListener, nsIRequestObserver, nsIInterfaceRequestor, - nsIFTPEventSink); + nsIFTPEventSink) NS_IMETHODIMP nsHTTPIndex::GetInterface(const nsIID &anIID, void **aResult ) @@ -1355,7 +1355,7 @@ nsDirectoryViewerFactory::~nsDirectoryViewerFactory() } -NS_IMPL_ISUPPORTS1(nsDirectoryViewerFactory, nsIDocumentLoaderFactory); +NS_IMPL_ISUPPORTS1(nsDirectoryViewerFactory, nsIDocumentLoaderFactory) diff --git a/xpfe/components/filepicker/src/nsFileView.cpp b/xpfe/components/filepicker/src/nsFileView.cpp index c4fd0f1a3a08..bdd539779df8 100644 --- a/xpfe/components/filepicker/src/nsFileView.cpp +++ b/xpfe/components/filepicker/src/nsFileView.cpp @@ -111,7 +111,7 @@ static const nsModuleComponentInfo components[] = NS_FILEVIEW_CONTRACTID, nsFileViewConstructor } }; -NS_IMPL_NSGETMODULE(nsFileViewModule, components); +NS_IMPL_NSGETMODULE(nsFileViewModule, components) nsFileView::nsFileView() : @@ -145,7 +145,7 @@ nsFileView::Init() // nsISupports implementation -NS_IMPL_ISUPPORTS2(nsFileView, nsITreeView, nsIFileView); +NS_IMPL_ISUPPORTS2(nsFileView, nsITreeView, nsIFileView) // nsIFileView implementation diff --git a/xpfe/components/find/src/nsFindService.cpp b/xpfe/components/find/src/nsFindService.cpp index 75f17caa824a..01126b8299eb 100644 --- a/xpfe/components/find/src/nsFindService.cpp +++ b/xpfe/components/find/src/nsFindService.cpp @@ -59,7 +59,7 @@ nsFindService::~nsFindService() { } -NS_IMPL_ISUPPORTS1(nsFindService, nsIFindService); +NS_IMPL_ISUPPORTS1(nsFindService, nsIFindService) /* attribute AString searchString; */ NS_IMETHODIMP nsFindService::GetSearchString(nsAString & aSearchString) diff --git a/xpfe/components/history/src/nsGlobalHistory.cpp b/xpfe/components/history/src/nsGlobalHistory.cpp index b30c39c53120..f0ab0f6893cb 100644 --- a/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/xpfe/components/history/src/nsGlobalHistory.cpp @@ -445,7 +445,7 @@ nsMdbTableEnumerator::~nsMdbTableEnumerator() } -NS_IMPL_ISUPPORTS1(nsMdbTableEnumerator, nsISimpleEnumerator); +NS_IMPL_ISUPPORTS1(nsMdbTableEnumerator, nsISimpleEnumerator) NS_IMETHODIMP nsMdbTableEnumerator::HasMoreElements(PRBool* _result) diff --git a/xpfe/components/intl/nsCharsetMenu.cpp b/xpfe/components/intl/nsCharsetMenu.cpp index 8f7f5a93e317..45f66a40a1a5 100644 --- a/xpfe/components/intl/nsCharsetMenu.cpp +++ b/xpfe/components/intl/nsCharsetMenu.cpp @@ -410,7 +410,7 @@ private: nsCharsetMenu* mCharsetMenu; }; -NS_IMPL_ISUPPORTS1(nsCharsetMenuObserver, nsIObserver); +NS_IMPL_ISUPPORTS1(nsCharsetMenuObserver, nsIObserver) NS_IMETHODIMP nsCharsetMenuObserver::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) { diff --git a/xpfe/components/search/src/nsInternetSearchService.cpp b/xpfe/components/search/src/nsInternetSearchService.cpp index b00e394bc323..d240a3f187d3 100755 --- a/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/xpfe/components/search/src/nsInternetSearchService.cpp @@ -913,8 +913,8 @@ InternetSearchDataSource::resolveSearchCategoryEngineURI(nsIRDFResource *engine, //////////////////////////////////////////////////////////////////////// -NS_IMPL_ADDREF(InternetSearchDataSource); -NS_IMPL_RELEASE(InternetSearchDataSource); +NS_IMPL_ADDREF(InternetSearchDataSource) +NS_IMPL_RELEASE(InternetSearchDataSource) NS_INTERFACE_MAP_BEGIN(InternetSearchDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIInternetSearchService) diff --git a/xpfe/components/startup/src/nsCommandLineService.cpp b/xpfe/components/startup/src/nsCommandLineService.cpp index 9367109fe60d..d287c92e8e42 100644 --- a/xpfe/components/startup/src/nsCommandLineService.cpp +++ b/xpfe/components/startup/src/nsCommandLineService.cpp @@ -56,7 +56,7 @@ nsCmdLineService::nsCmdLineService() /* * Implement the nsISupports methods... */ -NS_IMPL_ISUPPORTS1(nsCmdLineService, nsICmdLineService); +NS_IMPL_ISUPPORTS1(nsCmdLineService, nsICmdLineService) static void* ProcessURLArg(char* str) { diff --git a/xpfe/components/startup/src/nsUserInfoMac.cpp b/xpfe/components/startup/src/nsUserInfoMac.cpp index 1506787af549..06c65305a0f9 100644 --- a/xpfe/components/startup/src/nsUserInfoMac.cpp +++ b/xpfe/components/startup/src/nsUserInfoMac.cpp @@ -50,7 +50,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); +NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetFullname(PRUnichar **aFullname) diff --git a/xpfe/components/startup/src/nsUserInfoOS2.cpp b/xpfe/components/startup/src/nsUserInfoOS2.cpp index 2f224ef8bcfe..fb6e081c1238 100644 --- a/xpfe/components/startup/src/nsUserInfoOS2.cpp +++ b/xpfe/components/startup/src/nsUserInfoOS2.cpp @@ -39,7 +39,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); +NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetUsername(char **aUsername) diff --git a/xpfe/components/startup/src/nsUserInfoUnix.cpp b/xpfe/components/startup/src/nsUserInfoUnix.cpp index 84d876e8ca67..74a5658cc8f1 100644 --- a/xpfe/components/startup/src/nsUserInfoUnix.cpp +++ b/xpfe/components/startup/src/nsUserInfoUnix.cpp @@ -63,7 +63,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); +NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetFullname(PRUnichar **aFullname) diff --git a/xpfe/components/startup/src/nsUserInfoWin.cpp b/xpfe/components/startup/src/nsUserInfoWin.cpp index 22bd3f6cb9f8..b17e241730ea 100644 --- a/xpfe/components/startup/src/nsUserInfoWin.cpp +++ b/xpfe/components/startup/src/nsUserInfoWin.cpp @@ -51,7 +51,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); +NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetUsername(char **aUsername) diff --git a/xpfe/components/urlwidget/nsUrlWidget.cpp b/xpfe/components/urlwidget/nsUrlWidget.cpp index 6e8a6f0b0557..714e246f3844 100644 --- a/xpfe/components/urlwidget/nsUrlWidget.cpp +++ b/xpfe/components/urlwidget/nsUrlWidget.cpp @@ -132,7 +132,7 @@ nsUrlWidget::SetURLToHiddenControl( char const *aURL, nsIDOMWindowInternal *pare } // Use standard implementation of nsISupports stuff. -NS_IMPL_ISUPPORTS1( nsUrlWidget, nsIUrlWidget ); +NS_IMPL_ISUPPORTS1( nsUrlWidget, nsIUrlWidget ) nsUrlWidget::nsUrlWidget() { #ifdef DEBUG_URLWIDGET diff --git a/xpfe/components/winhooks/nsWindowsHooks.cpp b/xpfe/components/winhooks/nsWindowsHooks.cpp index af93ceb48dca..7a09616a9adb 100644 --- a/xpfe/components/winhooks/nsWindowsHooks.cpp +++ b/xpfe/components/winhooks/nsWindowsHooks.cpp @@ -111,7 +111,7 @@ static EditableFileTypeRegistryEntry // Implementation of the nsIWindowsHooksSettings interface. // Use standard implementation of nsISupports stuff. -NS_IMPL_ISUPPORTS1( nsWindowsHooksSettings, nsIWindowsHooksSettings ); +NS_IMPL_ISUPPORTS1( nsWindowsHooksSettings, nsIWindowsHooksSettings ) nsWindowsHooksSettings::nsWindowsHooksSettings() { } @@ -170,7 +170,7 @@ DEFINE_GETTER_AND_SETTER( HaveBeenSet, mHaveBeenSet ) // Implementation of the nsIWindowsHooks interface. // Use standard implementation of nsISupports stuff. -NS_IMPL_ISUPPORTS2( nsWindowsHooks, nsIWindowsHooks, nsIWindowsRegistry ); +NS_IMPL_ISUPPORTS2( nsWindowsHooks, nsIWindowsHooks, nsIWindowsRegistry ) nsWindowsHooks::nsWindowsHooks() { } diff --git a/xpfe/components/xremote/src/XRemoteService.cpp b/xpfe/components/xremote/src/XRemoteService.cpp index 481b8faca6d4..bba61294f692 100644 --- a/xpfe/components/xremote/src/XRemoteService.cpp +++ b/xpfe/components/xremote/src/XRemoteService.cpp @@ -952,4 +952,4 @@ static const nsModuleComponentInfo components[] = { XRemoteServiceConstructor } }; -NS_IMPL_NSGETMODULE(XRemoteServiceModule, components); +NS_IMPL_NSGETMODULE(XRemoteServiceModule, components) diff --git a/xpinstall/src/nsInstallTrigger.cpp b/xpinstall/src/nsInstallTrigger.cpp index 96f3020d824b..1aca7c302d62 100644 --- a/xpinstall/src/nsInstallTrigger.cpp +++ b/xpinstall/src/nsInstallTrigger.cpp @@ -78,7 +78,7 @@ nsInstallTrigger::~nsInstallTrigger() NS_IMPL_THREADSAFE_ISUPPORTS3 (nsInstallTrigger, nsIScriptObjectOwner, nsIDOMInstallTriggerGlobal, - nsIContentHandler); + nsIContentHandler) NS_IMETHODIMP diff --git a/xpinstall/src/nsSoftwareUpdate.cpp b/xpinstall/src/nsSoftwareUpdate.cpp index 17fad5aeaaa6..af357b71af7c 100644 --- a/xpinstall/src/nsSoftwareUpdate.cpp +++ b/xpinstall/src/nsSoftwareUpdate.cpp @@ -173,7 +173,7 @@ nsSoftwareUpdate::~nsSoftwareUpdate() NS_IMPL_THREADSAFE_ISUPPORTS3(nsSoftwareUpdate, nsISoftwareUpdate, nsPIXPIStubHook, - nsIObserver); + nsIObserver) void nsSoftwareUpdate::Shutdown() @@ -491,10 +491,10 @@ nsSoftwareUpdateNameSet::InitializeNameSet(nsIScriptContext* aScriptContext) // generic factory. NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsSoftwareUpdate, - nsSoftwareUpdate::GetInstance); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallTrigger); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallVersion); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsSoftwareUpdateNameSet); + nsSoftwareUpdate::GetInstance) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallTrigger) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallVersion) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsSoftwareUpdateNameSet) //---------------------------------------------------------------------- diff --git a/xpinstall/src/nsTopProgressNotifier.cpp b/xpinstall/src/nsTopProgressNotifier.cpp index 17162bd4e3d0..2bea9676e5e6 100644 --- a/xpinstall/src/nsTopProgressNotifier.cpp +++ b/xpinstall/src/nsTopProgressNotifier.cpp @@ -58,7 +58,7 @@ nsTopProgressListener::~nsTopProgressListener() } -NS_IMPL_THREADSAFE_ISUPPORTS1(nsTopProgressListener, nsIXPIListener); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsTopProgressListener, nsIXPIListener) long diff --git a/xpinstall/src/nsUpdateNotification.cpp b/xpinstall/src/nsUpdateNotification.cpp index 0cd023c35480..d5bad3c8f0c1 100644 --- a/xpinstall/src/nsUpdateNotification.cpp +++ b/xpinstall/src/nsUpdateNotification.cpp @@ -110,7 +110,7 @@ nsXPINotifierImpl::~nsXPINotifierImpl() } -NS_IMPL_ISUPPORTS2(nsXPINotifierImpl, nsIRDFXMLSinkObserver, nsIUpdateNotification); +NS_IMPL_ISUPPORTS2(nsXPINotifierImpl, nsIRDFXMLSinkObserver, nsIUpdateNotification) nsresult diff --git a/xpinstall/src/nsXPIProxy.cpp b/xpinstall/src/nsXPIProxy.cpp index e899313292be..378bb51a567b 100644 --- a/xpinstall/src/nsXPIProxy.cpp +++ b/xpinstall/src/nsXPIProxy.cpp @@ -41,7 +41,7 @@ nsXPIProxy::~nsXPIProxy() { } -NS_IMPL_THREADSAFE_ISUPPORTS1(nsXPIProxy, nsPIXPIProxy); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsXPIProxy, nsPIXPIProxy) NS_IMETHODIMP nsXPIProxy::RefreshPlugins(PRBool aReloadPages)