From 7262cdad6dd85a05e967372b540644657c3feb82 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Mon, 23 Apr 2007 14:22:04 +0000 Subject: [PATCH] Bug 376636 - Building with gcc 4.3 and -pendatic fails due to extra semicolons, patch by Art Haas , rs=me git-svn-id: svn://10.0.0.236/trunk@224885 18797224-902f-48f8-a5cc-f745e15eee43 --- .../src/base/nsAccessibleEventData.h | 2 +- .../accessible/src/xul/nsXULTreeAccessible.h | 2 +- .../src/nsNetscapeProfileMigratorBase.h | 2 +- .../migration/src/nsOperaProfileMigrator.h | 2 +- .../migration/src/nsProfileMigrator.h | 4 +- mozilla/caps/include/nsPrincipal.h | 2 +- .../content/base/src/nsContentIterator.cpp | 4 +- mozilla/content/base/src/nsDocument.h | 2 +- mozilla/content/base/src/nsGenericElement.h | 2 +- mozilla/content/base/src/nsNodeUtils.cpp | 2 +- .../html/content/src/nsFormSubmission.cpp | 4 +- .../html/content/src/nsHTMLInputElement.cpp | 2 +- .../html/content/src/nsHTMLScriptElement.cpp | 2 +- .../html/document/src/nsHTMLDocument.h | 2 +- .../content/svg/content/src/nsSVGPoint.cpp | 2 +- mozilla/content/svg/content/src/nsSVGRect.cpp | 2 +- mozilla/content/svg/content/src/nsSVGValue.h | 2 +- mozilla/content/xbl/src/nsXBLBinding.cpp | 4 +- mozilla/content/xbl/src/nsXBLDocumentInfo.h | 6 +- mozilla/content/xbl/src/nsXBLProtoImpl.h | 6 +- .../content/xbl/src/nsXBLProtoImplMember.h | 8 +-- .../content/xbl/src/nsXBLPrototypeBinding.cpp | 4 +- mozilla/content/xbl/src/nsXBLService.cpp | 2 +- .../content/xbl/src/nsXBLWindowKeyHandler.cpp | 2 +- .../content/xbl/src/nsXBLWindowKeyHandler.h | 2 +- mozilla/content/xslt/src/base/txCore.h | 2 +- mozilla/content/xslt/src/xpath/txXPathNode.h | 6 +- .../xslt/src/xslt/txEXSLTFunctions.cpp | 2 +- .../xslt/src/xslt/txMozillaXSLTProcessor.h | 2 +- .../content/xslt/src/xslt/txXMLEventHandler.h | 4 +- mozilla/content/xtf/src/nsXTFElementWrapper.h | 2 +- .../xul/content/src/nsXULPopupListener.cpp | 12 ++-- .../content/xul/document/src/nsXULDocument.h | 4 +- .../content/xul/templates/src/nsRDFQuery.h | 4 +- .../xul/templates/src/nsXULSortService.h | 4 +- .../docshell/base/nsGlobalHistory2Adapter.h | 2 +- .../docshell/base/nsGlobalHistoryAdapter.h | 2 +- mozilla/dom/src/base/nsFocusController.h | 2 +- mozilla/dom/src/storage/nsDOMStorage.h | 4 +- mozilla/dom/src/storage/nsDOMStorageDB.h | 4 +- .../composer/src/nsComposeTxtSrvFilter.h | 2 +- mozilla/editor/libeditor/html/TypeInState.h | 2 +- .../editor/libeditor/html/nsHTMLEditRules.h | 6 +- .../editor/libeditor/text/nsTextEditRules.h | 4 +- .../browser/gtk/src/EmbedContextMenuInfo.h | 2 +- .../browser/gtk/src/EmbedDownloadMgr.cpp | 4 +- .../browser/gtk/src/EmbedEventListener.h | 2 +- .../embedding/browser/gtk/src/EmbedPrivate.h | 4 +- .../browser/webBrowser/nsDocShellTreeOwner.h | 2 +- .../browser/webBrowser/nsWebBrowser.h | 2 +- .../src/base/CharDistribution.h | 26 ++++----- .../universalchardet/src/base/JpCntx.h | 12 ++-- .../universalchardet/src/base/nsBig5Prober.h | 10 ++-- .../src/base/nsCharSetProber.h | 2 +- .../src/base/nsCodingStateMachine.h | 10 ++-- .../universalchardet/src/base/nsEUCJPProber.h | 10 ++-- .../universalchardet/src/base/nsEUCKRProber.h | 10 ++-- .../universalchardet/src/base/nsEUCTWProber.h | 10 ++-- .../src/base/nsEscCharsetProber.h | 8 +-- .../src/base/nsGB2312Prober.h | 10 ++-- .../src/base/nsHebrewProber.h | 2 +- .../src/base/nsLatin1Prober.h | 10 ++-- .../src/base/nsMBCSGroupProber.h | 4 +- .../src/base/nsSBCSGroupProber.h | 4 +- .../src/base/nsSBCharSetProber.h | 6 +- .../universalchardet/src/base/nsSJISProber.h | 10 ++-- .../universalchardet/src/base/nsUTF8Prober.h | 10 ++-- .../xmlextras/pointers/src/nsXPointer.cpp | 4 +- mozilla/gfx/thebes/src/gfxFont.cpp | 2 +- mozilla/intl/chardet/src/nsCyrillicDetector.h | 12 ++-- mozilla/intl/chardet/src/nsDebugDetector.h | 6 +- mozilla/intl/chardet/src/nsDetectionAdaptor.h | 6 +- mozilla/intl/chardet/src/nsObserverBase.h | 4 +- mozilla/intl/chardet/src/nsPSMDetectors.h | 26 ++++----- mozilla/intl/locale/src/nsCollation.h | 2 +- .../intl/uconv/src/nsUTF8ConverterService.h | 4 +- mozilla/intl/uconv/src/nsUnicodeToUTF8.h | 4 +- mozilla/intl/uconv/ucvcn/nsCP936ToUnicode.h | 2 +- .../intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h | 2 +- mozilla/intl/uconv/ucvcn/nsGBKConvUtil.h | 4 +- mozilla/intl/uconv/ucvcn/nsGBKToUnicode.cpp | 6 +- mozilla/intl/uconv/ucvcn/nsGBKToUnicode.h | 6 +- .../intl/uconv/ucvcn/nsISO2022CNToUnicode.h | 8 +-- mozilla/intl/uconv/ucvcn/nsUnicodeToCP936.h | 2 +- .../intl/uconv/ucvcn/nsUnicodeToGB2312GL.h | 2 +- .../intl/uconv/ucvcn/nsUnicodeToGB2312V2.h | 2 +- mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp | 6 +- mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.h | 14 ++--- mozilla/intl/uconv/ucvcn/nsUnicodeToHZ.h | 2 +- .../intl/uconv/ucvja/nsJapaneseToUnicode.h | 24 ++++---- .../intl/uconv/ucvko/nsISO2022KRToUnicode.h | 8 +-- .../intl/uconv/ucvlatin/nsUCS2BEToUnicode.h | 2 +- .../ucvlatin/nsUnicodeToLangBoxArabic16.h | 4 +- .../ucvlatin/nsUnicodeToLangBoxArabic8.h | 4 +- .../intl/uconv/ucvlatin/nsUnicodeToTSCII.h | 8 +-- .../intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h | 6 +- .../intl/uconv/ucvlatin/nsUnicodeToUTF32.h | 8 +-- .../unicharutil/src/nsCaseConversionImp2.h | 2 +- .../unicharutil/util/nsCompressedCharMap.h | 2 +- mozilla/js/src/liveconnect/nsCLiveconnect.cpp | 2 +- mozilla/layout/base/nsFrameTraversal.cpp | 2 +- mozilla/layout/base/nsPresContext.h | 4 +- mozilla/layout/forms/nsTextControlFrame.h | 2 +- mozilla/layout/generic/nsFrame.h | 2 +- mozilla/layout/generic/nsInlineFrame.h | 2 +- mozilla/layout/generic/nsObjectFrame.h | 2 +- mozilla/layout/generic/nsSimplePageSequence.h | 2 +- mozilla/layout/inspector/src/inDOMView.cpp | 2 +- .../layout/mathml/base/src/nsMathMLChar.cpp | 2 +- mozilla/layout/style/nsCSSValue.h | 2 +- mozilla/layout/style/nsIStyleRuleProcessor.h | 2 +- mozilla/layout/style/nsRuleData.h | 4 +- mozilla/layout/style/nsRuleNode.cpp | 2 +- mozilla/layout/style/nsRuleNode.h | 24 ++++---- mozilla/layout/style/nsRuleWalker.h | 4 +- mozilla/layout/style/nsStyleContext.h | 2 +- mozilla/layout/style/nsStyleStruct.h | 56 +++++++++---------- mozilla/layout/tables/SpanningCellSorter.h | 2 +- .../layout/tables/nsITableLayoutStrategy.h | 2 +- mozilla/layout/tables/nsTableRowGroupFrame.h | 6 +- mozilla/layout/xul/base/src/nsBoxLayout.h | 2 +- mozilla/layout/xul/base/src/nsMenuBarFrame.h | 16 +++--- .../xul/base/src/nsMenuDismissalListener.h | 14 ++--- mozilla/layout/xul/base/src/nsMenuFrame.h | 12 ++-- .../layout/xul/base/src/nsMenuPopupFrame.h | 10 ++-- .../xul/base/src/nsXULTooltipListener.h | 26 ++++----- .../xul/base/src/tree/src/nsTreeBodyFrame.h | 10 ++-- .../xul/base/src/tree/src/nsTreeColumns.h | 36 ++++++------ .../base/src/tree/src/nsTreeImageListener.h | 14 ++--- .../xul/base/src/tree/src/nsTreeSelection.cpp | 24 ++++---- .../xul/base/src/tree/src/nsTreeStyleCache.h | 12 ++-- mozilla/modules/libjar/nsJAR.h | 4 +- mozilla/modules/libjar/nsXPTZipLoader.h | 2 +- mozilla/modules/libpref/src/nsPrefBranch.h | 2 +- .../modules/oji/src/nsCNullSecurityContext.h | 2 +- .../modules/plugin/base/src/ns4xPlugin.cpp | 2 +- .../plugin/base/src/ns4xPluginInstance.h | 2 +- .../netwerk/base/src/nsUnicharStreamLoader.h | 2 +- mozilla/netwerk/cookie/src/nsCookie.h | 2 +- .../netwerk/mime/src/nsMIMEHeaderParamImpl.h | 4 +- .../parser/htmlparser/src/nsParserService.cpp | 4 +- mozilla/rdf/base/src/nsInMemoryDataSource.cpp | 4 +- mozilla/rdf/base/src/rdfTriplesSerializer.cpp | 2 +- mozilla/security/manager/ssl/src/nsCMS.h | 2 +- .../security/manager/ssl/src/nsKeyModule.h | 2 +- .../security/manager/ssl/src/nsNSSComponent.h | 2 +- .../downloads/src/nsDownloadManager.h | 12 ++-- .../src/nsUrlClassifierStreamUpdater.cpp | 2 +- .../src/nsUrlClassifierStreamUpdater.h | 2 +- mozilla/tools/leaky/config.h | 2 +- mozilla/tools/leaky/libmalloc.h | 2 +- .../widget/src/gtk2/nsDeviceContextSpecG.cpp | 2 +- mozilla/xpcom/glue/nsGenericFactory.h | 2 +- mozilla/xpcom/io/nsBinaryStream.h | 8 +-- mozilla/xpcom/io/nsScriptableInputStream.h | 4 +- mozilla/xpinstall/src/nsSoftwareUpdate.h | 2 +- 156 files changed, 444 insertions(+), 444 deletions(-) diff --git a/mozilla/accessible/src/base/nsAccessibleEventData.h b/mozilla/accessible/src/base/nsAccessibleEventData.h index b30a54d7059..3a905b969db 100644 --- a/mozilla/accessible/src/base/nsAccessibleEventData.h +++ b/mozilla/accessible/src/base/nsAccessibleEventData.h @@ -53,7 +53,7 @@ public: nsAccEvent(PRUint32 aEventType, nsIAccessible *aAccessible, void *aEventData); // Initialize with an nsIDOMNode nsAccEvent(PRUint32 aEventType, nsIDOMNode *aDOMNode, void *aEventData); - virtual ~nsAccEvent() {}; + virtual ~nsAccEvent() {} NS_DECL_ISUPPORTS NS_DECL_NSIACCESSIBLEEVENT diff --git a/mozilla/accessible/src/xul/nsXULTreeAccessible.h b/mozilla/accessible/src/xul/nsXULTreeAccessible.h index a723971d865..5f903e2264f 100644 --- a/mozilla/accessible/src/xul/nsXULTreeAccessible.h +++ b/mozilla/accessible/src/xul/nsXULTreeAccessible.h @@ -60,7 +60,7 @@ public: NS_DECL_NSIACCESSIBLETREECACHE nsXULTreeAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell); - virtual ~nsXULTreeAccessible() {}; + virtual ~nsXULTreeAccessible() {} /* ----- nsIAccessible ----- */ NS_IMETHOD Shutdown(); diff --git a/mozilla/browser/components/migration/src/nsNetscapeProfileMigratorBase.h b/mozilla/browser/components/migration/src/nsNetscapeProfileMigratorBase.h index d9c4989bb1d..2a850ece32d 100644 --- a/mozilla/browser/components/migration/src/nsNetscapeProfileMigratorBase.h +++ b/mozilla/browser/components/migration/src/nsNetscapeProfileMigratorBase.h @@ -50,7 +50,7 @@ class nsNetscapeProfileMigratorBase { public: nsNetscapeProfileMigratorBase(); - virtual ~nsNetscapeProfileMigratorBase() { }; + virtual ~nsNetscapeProfileMigratorBase() { } public: typedef nsresult(*prefConverter)(void*, nsIPrefBranch*); diff --git a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.h b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.h index 0a4682dd93e..500b8b7ed7c 100644 --- a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.h +++ b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.h @@ -181,7 +181,7 @@ public: } TAG; protected: - nsOperaCookieMigrator() { }; + nsOperaCookieMigrator() { } nsresult ReadHeader(); diff --git a/mozilla/browser/components/migration/src/nsProfileMigrator.h b/mozilla/browser/components/migration/src/nsProfileMigrator.h index 486c1d34af9..4dbdf6c9a99 100644 --- a/mozilla/browser/components/migration/src/nsProfileMigrator.h +++ b/mozilla/browser/components/migration/src/nsProfileMigrator.h @@ -51,10 +51,10 @@ public: NS_DECL_NSIPROFILEMIGRATOR NS_DECL_ISUPPORTS - nsProfileMigrator() { }; + nsProfileMigrator() { } protected: - ~nsProfileMigrator() { }; + ~nsProfileMigrator() { } nsresult GetDefaultBrowserMigratorKey(nsACString& key, nsCOMPtr& bpm); diff --git a/mozilla/caps/include/nsPrincipal.h b/mozilla/caps/include/nsPrincipal.h index 7a53960ffa9..c5ceb53f825 100755 --- a/mozilla/caps/include/nsPrincipal.h +++ b/mozilla/caps/include/nsPrincipal.h @@ -117,7 +117,7 @@ protected: prettyName(aPrettyName), cert(aCert) { - }; + } nsCString fingerprint; nsCString subjectName; nsCString prettyName; diff --git a/mozilla/content/base/src/nsContentIterator.cpp b/mozilla/content/base/src/nsContentIterator.cpp index 89c8bf6bdbf..a2cdd464a6a 100644 --- a/mozilla/content/base/src/nsContentIterator.cpp +++ b/mozilla/content/base/src/nsContentIterator.cpp @@ -1223,8 +1223,8 @@ nsContentIterator::GetCurrentNode() class nsContentSubtreeIterator : public nsContentIterator { public: - nsContentSubtreeIterator() {}; - virtual ~nsContentSubtreeIterator() {}; + nsContentSubtreeIterator() {} + virtual ~nsContentSubtreeIterator() {} // nsContentIterator overrides ------------------------------ diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 472761e7f6a..a00f7c809c1 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -700,7 +700,7 @@ protected: virtual PRInt32 GetDefaultNamespaceID() const { return kNameSpaceID_None; - }; + } // Dispatch an event to the ScriptGlobalObject for this document void DispatchEventToWindow(nsEvent *aEvent); diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h index dee82ff2385..e1715c059d8 100644 --- a/mozilla/content/base/src/nsGenericElement.h +++ b/mozilla/content/base/src/nsGenericElement.h @@ -136,7 +136,7 @@ public: nsIContent* aContent2); protected: - virtual ~nsNode3Tearoff() {}; + virtual ~nsNode3Tearoff() {} private: nsCOMPtr mContent; diff --git a/mozilla/content/base/src/nsNodeUtils.cpp b/mozilla/content/base/src/nsNodeUtils.cpp index 82e8b8ce84f..c38e8f6b885 100755 --- a/mozilla/content/base/src/nsNodeUtils.cpp +++ b/mozilla/content/base/src/nsNodeUtils.cpp @@ -329,7 +329,7 @@ public: mNewScope(aNewScope), mNodesWithProperties(aNodesWithProperties) { - }; + } nsIDOMElement *mElement; nsNodeInfoManager *mNewNodeInfoManager; diff --git a/mozilla/content/html/content/src/nsFormSubmission.cpp b/mozilla/content/html/content/src/nsFormSubmission.cpp index c0651cc93a1..401de3795bc 100644 --- a/mozilla/content/html/content/src/nsFormSubmission.cpp +++ b/mozilla/content/html/content/src/nsFormSubmission.cpp @@ -99,10 +99,10 @@ public: mFormProcessor(aFormProcessor), mBidiOptions(aBidiOptions) { - }; + } virtual ~nsFormSubmission() { - }; + } NS_DECL_ISUPPORTS diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index 050944c6fd5..6a670530014 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -2855,7 +2855,7 @@ nsHTMLInputElement::VisitGroup(nsIRadioVisitor* aVisitor, PRBool aFlushContent) class nsRadioVisitor : public nsIRadioVisitor { public: nsRadioVisitor() { } - virtual ~nsRadioVisitor() { }; + virtual ~nsRadioVisitor() { } NS_DECL_ISUPPORTS diff --git a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp index 761fc9cb137..27a81f902f8 100644 --- a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp @@ -65,7 +65,7 @@ class nsHTMLScriptEventHandler : public nsIScriptEventHandler { public: nsHTMLScriptEventHandler(nsIDOMHTMLScriptElement *aOuter); - virtual ~nsHTMLScriptEventHandler() {}; + virtual ~nsHTMLScriptEventHandler() {} // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/content/html/document/src/nsHTMLDocument.h b/mozilla/content/html/document/src/nsHTMLDocument.h index f77506a6058..b08857cb9cd 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.h +++ b/mozilla/content/html/document/src/nsHTMLDocument.h @@ -253,7 +253,7 @@ protected: PRInt32 GetDefaultNamespaceID() const { return mDefaultNamespaceID; - }; + } nsCOMArray mImageMaps; diff --git a/mozilla/content/svg/content/src/nsSVGPoint.cpp b/mozilla/content/svg/content/src/nsSVGPoint.cpp index 528deaf195d..cee03db383c 100644 --- a/mozilla/content/svg/content/src/nsSVGPoint.cpp +++ b/mozilla/content/svg/content/src/nsSVGPoint.cpp @@ -183,7 +183,7 @@ public: nsSVGReadonlyPoint(float x, float y) : nsSVGPoint(x, y) { - }; + } // override setters to make the whole object readonly NS_IMETHODIMP SetX(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; } diff --git a/mozilla/content/svg/content/src/nsSVGRect.cpp b/mozilla/content/svg/content/src/nsSVGRect.cpp index 949856b8872..074238b5981 100644 --- a/mozilla/content/svg/content/src/nsSVGRect.cpp +++ b/mozilla/content/svg/content/src/nsSVGRect.cpp @@ -220,7 +220,7 @@ public: nsSVGReadonlyRect(float x, float y, float width, float height) : nsSVGRect(x, y, width, height) { - }; + } // override setters to make the whole object readonly NS_IMETHODIMP SetX(float) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; } diff --git a/mozilla/content/svg/content/src/nsSVGValue.h b/mozilla/content/svg/content/src/nsSVGValue.h index 73311452134..e234fb0a2f4 100644 --- a/mozilla/content/svg/content/src/nsSVGValue.h +++ b/mozilla/content/svg/content/src/nsSVGValue.h @@ -78,7 +78,7 @@ protected: modificationType aModType); PRInt32 GetModifyNestCount() { return mModifyNestCount; } private: - virtual void OnDidModify(){}; // hook that will be called before observers are notified + virtual void OnDidModify(){} // hook that will be called before observers are notified nsSmallVoidArray mObservers; PRInt32 mModifyNestCount; diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp index 19e9ef6c38a..e975e9836e0 100644 --- a/mozilla/content/xbl/src/nsXBLBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLBinding.cpp @@ -259,7 +259,7 @@ struct EnumData { EnumData(nsXBLBinding* aBinding) :mBinding(aBinding) - {}; + {} }; struct ContentListData : public EnumData { @@ -268,7 +268,7 @@ struct ContentListData : public EnumData { ContentListData(nsXBLBinding* aBinding, nsBindingManager* aManager) :EnumData(aBinding), mBindingManager(aManager), mRv(NS_OK) - {}; + {} }; PR_STATIC_CALLBACK(PLDHashOperator) diff --git a/mozilla/content/xbl/src/nsXBLDocumentInfo.h b/mozilla/content/xbl/src/nsXBLDocumentInfo.h index 486c09f4663..dba724780a0 100644 --- a/mozilla/content/xbl/src/nsXBLDocumentInfo.h +++ b/mozilla/content/xbl/src/nsXBLDocumentInfo.h @@ -52,11 +52,11 @@ public: nsXBLDocumentInfo(nsIDocument* aDocument); virtual ~nsXBLDocumentInfo(); - NS_IMETHOD GetDocument(nsIDocument** aResult) { NS_ADDREF(*aResult = mDocument); return NS_OK; }; + NS_IMETHOD GetDocument(nsIDocument** aResult) { NS_ADDREF(*aResult = mDocument); return NS_OK; } - NS_IMETHOD GetScriptAccess(PRBool* aResult) { *aResult = mScriptAccess; return NS_OK; }; + NS_IMETHOD GetScriptAccess(PRBool* aResult) { *aResult = mScriptAccess; return NS_OK; } - NS_IMETHOD_(nsIURI*) DocumentURI() { return mDocument->GetDocumentURI(); }; + NS_IMETHOD_(nsIURI*) DocumentURI() { return mDocument->GetDocumentURI(); } NS_IMETHOD GetPrototypeBinding(const nsACString& aRef, nsXBLPrototypeBinding** aResult); NS_IMETHOD SetPrototypeBinding(const nsACString& aRef, nsXBLPrototypeBinding* aBinding); diff --git a/mozilla/content/xbl/src/nsXBLProtoImpl.h b/mozilla/content/xbl/src/nsXBLProtoImpl.h index ee7aee08503..cfc3ce7eee4 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImpl.h +++ b/mozilla/content/xbl/src/nsXBLProtoImpl.h @@ -56,7 +56,7 @@ public: mDestructor(nsnull) { MOZ_COUNT_CTOR(nsXBLProtoImpl); - }; + } ~nsXBLProtoImpl() { MOZ_COUNT_DTOR(nsXBLProtoImpl); @@ -65,7 +65,7 @@ public: for (nsXBLProtoImplMember* curr = mMembers; curr; curr=curr->GetNext()) curr->Destroy(mClassObject != nsnull); delete mMembers; - }; + } nsresult InstallImplementation(nsXBLPrototypeBinding* aBinding, nsIContent* aBoundElement); nsresult InitTargetObjects(nsXBLPrototypeBinding* aBinding, nsIScriptContext* aContext, @@ -74,7 +74,7 @@ public: void** aTargetClassObject); nsresult CompilePrototypeMembers(nsXBLPrototypeBinding* aBinding); - void SetMemberList(nsXBLProtoImplMember* aMemberList) { delete mMembers; mMembers = aMemberList; }; + void SetMemberList(nsXBLProtoImplMember* aMemberList) { delete mMembers; mMembers = aMemberList; } protected: // Function to call if compilation of a member fails. When this is called, diff --git a/mozilla/content/xbl/src/nsXBLProtoImplMember.h b/mozilla/content/xbl/src/nsXBLProtoImplMember.h index 4372678aa54..6f6c7c75428 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImplMember.h +++ b/mozilla/content/xbl/src/nsXBLProtoImplMember.h @@ -97,12 +97,12 @@ struct nsXBLTextWithLineNumber class nsXBLProtoImplMember { public: - nsXBLProtoImplMember(const PRUnichar* aName) :mNext(nsnull) { mName = ToNewUnicode(nsDependentString(aName)); }; - virtual ~nsXBLProtoImplMember() { nsMemory::Free(mName); delete mNext; }; + nsXBLProtoImplMember(const PRUnichar* aName) :mNext(nsnull) { mName = ToNewUnicode(nsDependentString(aName)); } + virtual ~nsXBLProtoImplMember() { nsMemory::Free(mName); delete mNext; } virtual void Destroy(PRBool aIsCompiled)=0; - nsXBLProtoImplMember* GetNext() { return mNext; }; - void SetNext(nsXBLProtoImplMember* aNext) { mNext = aNext; }; + nsXBLProtoImplMember* GetNext() { return mNext; } + void SetNext(nsXBLProtoImplMember* aNext) { mNext = aNext; } virtual nsresult InstallMember(nsIScriptContext* aContext, nsIContent* aBoundElement, diff --git a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp index 843429cc504..b5e2dc46e6f 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -547,7 +547,7 @@ struct InsertionData { InsertionData(nsXBLBinding* aBinding, nsXBLPrototypeBinding* aPrototype) - :mBinding(aBinding), mPrototype(aPrototype) {}; + :mBinding(aBinding), mPrototype(aPrototype) {} }; PRBool PR_CALLBACK InstantiateInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) @@ -847,7 +847,7 @@ struct nsXBLAttrChangeData nsXBLAttrChangeData(nsXBLPrototypeBinding* aProto, nsIContent* aElt, nsIContent* aContent) - :mProto(aProto), mBoundElement(aElt), mContent(aContent) {}; + :mProto(aProto), mBoundElement(aElt), mContent(aContent) {} }; // XXXbz this duplicates lots of AttributeChanged diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp index 41917674604..310b511168a 100644 --- a/mozilla/content/xbl/src/nsXBLService.cpp +++ b/mozilla/content/xbl/src/nsXBLService.cpp @@ -264,7 +264,7 @@ public: nsXBLStreamListener(nsXBLService* aXBLService, nsIStreamListener* aInner, nsIDocument* aDocument, nsIDocument* aBindingDocument); - void AddRequest(nsXBLBindingRequest* aRequest) { mBindingRequests.AppendElement(aRequest); }; + void AddRequest(nsXBLBindingRequest* aRequest) { mBindingRequests.AppendElement(aRequest); } PRBool HasRequest(nsIURI* aURI, nsIContent* aBoundElement); private: diff --git a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp index d6eb432f92e..acf9b96f105 100644 --- a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp @@ -93,7 +93,7 @@ public: const nsACString& aRef, nsXBLPrototypeHandler** aResult); - nsXBLSpecialDocInfo() : mInitialized(PR_FALSE) {}; + nsXBLSpecialDocInfo() : mInitialized(PR_FALSE) {} }; const char nsXBLSpecialDocInfo::sHTMLBindingStr[] = diff --git a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h index 1d29fa9813f..913b5b4c3a7 100644 --- a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h +++ b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h @@ -60,7 +60,7 @@ public: NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; - }; + } NS_IMETHOD KeyUp(nsIDOMEvent* aKeyEvent); NS_IMETHOD KeyDown(nsIDOMEvent* aKeyEvent); diff --git a/mozilla/content/xslt/src/base/txCore.h b/mozilla/content/xslt/src/base/txCore.h index 763ff97545b..d0700c71841 100644 --- a/mozilla/content/xslt/src/base/txCore.h +++ b/mozilla/content/xslt/src/base/txCore.h @@ -54,7 +54,7 @@ public: */ virtual ~txObject() { - }; + } }; /** diff --git a/mozilla/content/xslt/src/xpath/txXPathNode.h b/mozilla/content/xslt/src/xpath/txXPathNode.h index 145dd3d4506..3c38de84c6f 100644 --- a/mozilla/content/xslt/src/xpath/txXPathNode.h +++ b/mozilla/content/xslt/src/xpath/txXPathNode.h @@ -118,15 +118,15 @@ private: PRBool isDocument() const { return mIndex == eDocument; - }; + } PRBool isContent() const { return mIndex == eContent; - }; + } PRBool isAttribute() const { return mIndex != eDocument && mIndex != eContent; - }; + } nsIContent* Content() const { diff --git a/mozilla/content/xslt/src/xslt/txEXSLTFunctions.cpp b/mozilla/content/xslt/src/xslt/txEXSLTFunctions.cpp index 48fbd4cb2cb..6623dfc5536 100644 --- a/mozilla/content/xslt/src/xslt/txEXSLTFunctions.cpp +++ b/mozilla/content/xslt/src/xslt/txEXSLTFunctions.cpp @@ -750,4 +750,4 @@ TX_InitEXSLTFunction() } return PR_TRUE; -} \ No newline at end of file +} diff --git a/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h b/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h index 1cfc9fd17dd..92211dfdf70 100644 --- a/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h +++ b/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h @@ -102,7 +102,7 @@ public: NS_IMETHOD LoadStyleSheet(nsIURI* aUri, nsILoadGroup* aLoadGroup, nsIPrincipal* aCallerPrincipal); NS_IMETHOD SetSourceContentModel(nsIDOMNode* aSource); - NS_IMETHOD CancelLoads() {return NS_OK;}; + NS_IMETHOD CancelLoads() {return NS_OK;} NS_IMETHOD AddXSLTParamNamespace(const nsString& aPrefix, const nsString& aNamespace); NS_IMETHOD AddXSLTParam(const nsString& aName, diff --git a/mozilla/content/xslt/src/xslt/txXMLEventHandler.h b/mozilla/content/xslt/src/xslt/txXMLEventHandler.h index ba41a41f35f..07bcbec83fe 100644 --- a/mozilla/content/xslt/src/xslt/txXMLEventHandler.h +++ b/mozilla/content/xslt/src/xslt/txXMLEventHandler.h @@ -61,7 +61,7 @@ class nsIDOMDocument; class txAXMLEventHandler { public: - virtual ~txAXMLEventHandler() {}; + virtual ~txAXMLEventHandler() {} /** * Signals to receive the start of an attribute. @@ -204,7 +204,7 @@ public: class txAOutputHandlerFactory { public: - virtual ~txAOutputHandlerFactory() {}; + virtual ~txAOutputHandlerFactory() {} /** * Creates an outputhandler for the specified format. diff --git a/mozilla/content/xtf/src/nsXTFElementWrapper.h b/mozilla/content/xtf/src/nsXTFElementWrapper.h index 77b0992cc5b..b85fae77736 100644 --- a/mozilla/content/xtf/src/nsXTFElementWrapper.h +++ b/mozilla/content/xtf/src/nsXTFElementWrapper.h @@ -133,7 +133,7 @@ protected: virtual nsIXTFElement* GetXTFElement() const { return mXTFElement; - }; + } // implementation helpers: PRBool QueryInterfaceInner(REFNSIID aIID, void** result); diff --git a/mozilla/content/xul/content/src/nsXULPopupListener.cpp b/mozilla/content/xul/content/src/nsXULPopupListener.cpp index 83b710ceac6..ff7390cbdf2 100644 --- a/mozilla/content/xul/content/src/nsXULPopupListener.cpp +++ b/mozilla/content/xul/content/src/nsXULPopupListener.cpp @@ -112,17 +112,17 @@ public: // nsIDOMMouseListener NS_IMETHOD MouseDown(nsIDOMEvent* aMouseEvent); - NS_IMETHOD MouseUp(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; }; + NS_IMETHOD MouseUp(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; } // nsIDOMContextMenuListener NS_IMETHOD ContextMenu(nsIDOMEvent* aContextMenuEvent); // nsIDOMEventListener - NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; }; + NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; } protected: diff --git a/mozilla/content/xul/document/src/nsXULDocument.h b/mozilla/content/xul/document/src/nsXULDocument.h index 8b6ba634649..345a1925de6 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.h +++ b/mozilla/content/xul/document/src/nsXULDocument.h @@ -197,7 +197,7 @@ protected: nsIContent* aElement, void* aClosure); - void SetIsPopup(PRBool isPopup) { mIsPopup = isPopup; }; + void SetIsPopup(PRBool isPopup) { mIsPopup = isPopup; } nsresult PrepareToLoad(nsISupports* aContainer, const char* aCommand, @@ -235,7 +235,7 @@ protected: PRInt32 GetDefaultNamespaceID() const { return kNameSpaceID_XUL; - }; + } protected: // pseudo constants diff --git a/mozilla/content/xul/templates/src/nsRDFQuery.h b/mozilla/content/xul/templates/src/nsRDFQuery.h index dd66b9c5d4e..7db9d3c6ad0 100755 --- a/mozilla/content/xul/templates/src/nsRDFQuery.h +++ b/mozilla/content/xul/templates/src/nsRDFQuery.h @@ -87,9 +87,9 @@ public: * Retrieve the root node in the rule network * @return the root node in the rule network */ - TestNode* GetRoot() { return mRoot; }; + TestNode* GetRoot() { return mRoot; } - void SetRoot(TestNode* aRoot) { mRoot = aRoot; }; + void SetRoot(TestNode* aRoot) { mRoot = aRoot; } void GetQueryNode(nsIDOMNode** aQueryNode) { diff --git a/mozilla/content/xul/templates/src/nsXULSortService.h b/mozilla/content/xul/templates/src/nsXULSortService.h index f06804da3df..8efdc1b0f2f 100644 --- a/mozilla/content/xul/templates/src/nsXULSortService.h +++ b/mozilla/content/xul/templates/src/nsXULSortService.h @@ -120,8 +120,8 @@ struct contentSortInfo { class XULSortServiceImpl : public nsIXULSortService { protected: - XULSortServiceImpl(void) {}; - virtual ~XULSortServiceImpl(void) {}; + XULSortServiceImpl(void) {} + virtual ~XULSortServiceImpl(void) {} friend nsresult NS_NewXULSortService(nsIXULSortService** mgr); diff --git a/mozilla/docshell/base/nsGlobalHistory2Adapter.h b/mozilla/docshell/base/nsGlobalHistory2Adapter.h index ce86c7e432c..1306a3c1708 100644 --- a/mozilla/docshell/base/nsGlobalHistory2Adapter.h +++ b/mozilla/docshell/base/nsGlobalHistory2Adapter.h @@ -65,7 +65,7 @@ public: const char* aType, const nsModuleComponentInfo *aInfo); - NS_DEFINE_STATIC_CID_ACCESSOR(NS_GLOBALHISTORY2ADAPTER_CID); + NS_DEFINE_STATIC_CID_ACCESSOR(NS_GLOBALHISTORY2ADAPTER_CID) private: nsGlobalHistory2Adapter(); diff --git a/mozilla/docshell/base/nsGlobalHistoryAdapter.h b/mozilla/docshell/base/nsGlobalHistoryAdapter.h index 2977e00816f..8a4fcd63ea1 100644 --- a/mozilla/docshell/base/nsGlobalHistoryAdapter.h +++ b/mozilla/docshell/base/nsGlobalHistoryAdapter.h @@ -66,7 +66,7 @@ public: const char* aType, const nsModuleComponentInfo *aInfo); - NS_DEFINE_STATIC_CID_ACCESSOR(NS_GLOBALHISTORYADAPTER_CID); + NS_DEFINE_STATIC_CID_ACCESSOR(NS_GLOBALHISTORYADAPTER_CID) private: nsGlobalHistoryAdapter(); diff --git a/mozilla/dom/src/base/nsFocusController.h b/mozilla/dom/src/base/nsFocusController.h index dce57361fe3..0b1f0b47eeb 100644 --- a/mozilla/dom/src/base/nsFocusController.h +++ b/mozilla/dom/src/base/nsFocusController.h @@ -102,7 +102,7 @@ public: NS_IMETHOD Blur(nsIDOMEvent* aEvent); // nsIDOMEventListener - NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; }; + NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; } NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsFocusController, nsIFocusController) diff --git a/mozilla/dom/src/storage/nsDOMStorage.h b/mozilla/dom/src/storage/nsDOMStorage.h index ab36b4160e3..81d63a875a9 100644 --- a/mozilla/dom/src/storage/nsDOMStorage.h +++ b/mozilla/dom/src/storage/nsDOMStorage.h @@ -199,9 +199,9 @@ public: nsDOMStorageList() { mStorages.Init(); - }; + } - virtual ~nsDOMStorageList() {}; + virtual ~nsDOMStorageList() {} // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/dom/src/storage/nsDOMStorageDB.h b/mozilla/dom/src/storage/nsDOMStorageDB.h index 9fc1fd3b5e4..8a10b1db189 100644 --- a/mozilla/dom/src/storage/nsDOMStorageDB.h +++ b/mozilla/dom/src/storage/nsDOMStorageDB.h @@ -50,8 +50,8 @@ class nsSessionStorageEntry; class nsDOMStorageDB { public: - nsDOMStorageDB() {}; - ~nsDOMStorageDB() {}; + nsDOMStorageDB() {} + ~nsDOMStorageDB() {} nsresult Init(); diff --git a/mozilla/editor/composer/src/nsComposeTxtSrvFilter.h b/mozilla/editor/composer/src/nsComposeTxtSrvFilter.h index 05cbce1a276..ecd83d28ccc 100644 --- a/mozilla/editor/composer/src/nsComposeTxtSrvFilter.h +++ b/mozilla/editor/composer/src/nsComposeTxtSrvFilter.h @@ -52,7 +52,7 @@ class nsComposeTxtSrvFilter : public nsITextServicesFilter { public: nsComposeTxtSrvFilter(); - virtual ~nsComposeTxtSrvFilter() {}; + virtual ~nsComposeTxtSrvFilter() {} // nsISupports interface... NS_DECL_ISUPPORTS diff --git a/mozilla/editor/libeditor/html/TypeInState.h b/mozilla/editor/libeditor/html/TypeInState.h index ae2f7bd08d8..e86ea70395a 100644 --- a/mozilla/editor/libeditor/html/TypeInState.h +++ b/mozilla/editor/libeditor/html/TypeInState.h @@ -52,7 +52,7 @@ struct PropItem nsString attr; nsString value; - PropItem() : tag(nsnull), attr(), value() {}; + PropItem() : tag(nsnull), attr(), value() {} PropItem(nsIAtom *aTag, const nsAString &aAttr, const nsAString &aValue); ~PropItem(); }; diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.h b/mozilla/editor/libeditor/html/nsHTMLEditRules.h index 356e424fb94..6ab272dd98e 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.h +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.h @@ -58,10 +58,10 @@ struct StyleCache : public PropItem { PRBool mPresent; - StyleCache() : PropItem(nsnull, EmptyString(), EmptyString()), mPresent(PR_FALSE){}; + StyleCache() : PropItem(nsnull, EmptyString(), EmptyString()), mPresent(PR_FALSE){} StyleCache(nsIAtom *aTag, const nsAString &aAttr, const nsAString &aValue) : - PropItem(aTag, aAttr, aValue), mPresent(PR_FALSE) {}; - ~StyleCache() {}; + PropItem(aTag, aAttr, aValue), mPresent(PR_FALSE) {} + ~StyleCache() {} }; diff --git a/mozilla/editor/libeditor/text/nsTextEditRules.h b/mozilla/editor/libeditor/text/nsTextEditRules.h index 4dd4dacd503..5de5dfeadb1 100644 --- a/mozilla/editor/libeditor/text/nsTextEditRules.h +++ b/mozilla/editor/libeditor/text/nsTextEditRules.h @@ -241,9 +241,9 @@ class nsTextRulesInfo : public nsRulesInfo alignType(0), blockType(0), insertElement(0) - {}; + {} - virtual ~nsTextRulesInfo() {}; + virtual ~nsTextRulesInfo() {} // kInsertText const nsAString *inString; diff --git a/mozilla/embedding/browser/gtk/src/EmbedContextMenuInfo.h b/mozilla/embedding/browser/gtk/src/EmbedContextMenuInfo.h index f5933735eb8..86f548a3e7e 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedContextMenuInfo.h +++ b/mozilla/embedding/browser/gtk/src/EmbedContextMenuInfo.h @@ -74,7 +74,7 @@ public: nsresult CheckDomImageElement(nsIDOMNode *node, nsString& aHref, PRInt32 *aWidth, PRInt32 *aHeight); nsresult GetImageRequest(imgIRequest **aRequest, nsIDOMNode *aDOMNode); - nsString GetCtxDocTitle(void) { return mCtxDocTitle; }; + nsString GetCtxDocTitle(void) { return mCtxDocTitle; } PRInt32 mX, mY, mObjWidth, mObjHeight, mCtxFrameNum; diff --git a/mozilla/embedding/browser/gtk/src/EmbedDownloadMgr.cpp b/mozilla/embedding/browser/gtk/src/EmbedDownloadMgr.cpp index e73eb653d00..3979aae9f2c 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedDownloadMgr.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedDownloadMgr.cpp @@ -80,11 +80,11 @@ class ProgressListener : public nsIWebProgressListener2 public: ProgressListener(EmbedDownload *aDownload):mDownload(aDownload) { - }; + } ~ProgressListener(void) { - }; + } NS_DECL_ISUPPORTS NS_DECL_NSIWEBPROGRESSLISTENER diff --git a/mozilla/embedding/browser/gtk/src/EmbedEventListener.h b/mozilla/embedding/browser/gtk/src/EmbedEventListener.h index 039d7fe6811..2307e7931ea 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedEventListener.h +++ b/mozilla/embedding/browser/gtk/src/EmbedEventListener.h @@ -120,7 +120,7 @@ class EmbedEventListener : public nsIDOMKeyListener, // nsIDOMMouseMotionListener NS_IMETHOD MouseMove(nsIDOMEvent* aDOMEvent); NS_IMETHOD DragMove(nsIDOMEvent* aMouseEvent); - EmbedContextMenuInfo* GetContextInfo() { return mCtxInfo; }; + EmbedContextMenuInfo* GetContextInfo() { return mCtxInfo; } // nsIDOMFocusListener NS_IMETHOD Focus(nsIDOMEvent* aEvent); diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h index a9ada0ca5e3..962bf405b3f 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h @@ -85,8 +85,8 @@ class nsIDirectoryServiceProvider; class EmbedCommon { public: EmbedCommon() { - }; - ~EmbedCommon() { }; + } + ~EmbedCommon() { } static EmbedCommon* GetInstance(); static void DeleteInstance(); nsresult Init(void); diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h index 009ab5e55ce..f192dd382f4 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h @@ -201,7 +201,7 @@ public: // nsIDOMMouseMotionListener NS_IMETHOD MouseMove(nsIDOMEvent* aMouseEvent); - NS_IMETHOD DragMove(nsIDOMEvent* aMouseEvent) { return NS_OK; }; + NS_IMETHOD DragMove(nsIDOMEvent* aMouseEvent) { return NS_OK; } // nsIDOMKeyListener NS_IMETHOD KeyDown(nsIDOMEvent* aKeyEvent) ; diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.h b/mozilla/embedding/browser/webBrowser/nsWebBrowser.h index b8880c61e8a..4b3df13d29d 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.h +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.h @@ -93,7 +93,7 @@ public: PRBool Equals(nsIWeakReference *aListener, const nsIID& aID) { if (mWeakPtr.get() == aListener && mID.Equals(aID)) return PR_TRUE; return PR_FALSE; - }; + } nsWeakPtr mWeakPtr; nsIID mID; diff --git a/mozilla/extensions/universalchardet/src/base/CharDistribution.h b/mozilla/extensions/universalchardet/src/base/CharDistribution.h index 724d4bf1d35..dbc9e564876 100644 --- a/mozilla/extensions/universalchardet/src/base/CharDistribution.h +++ b/mozilla/extensions/universalchardet/src/base/CharDistribution.h @@ -45,10 +45,10 @@ class CharDistributionAnalysis { public: - CharDistributionAnalysis() {Reset();}; + CharDistributionAnalysis() {Reset();} //feed a block of data and do distribution analysis - void HandleData(const char* aBuf, PRUint32 aLen) {}; + void HandleData(const char* aBuf, PRUint32 aLen) {} //Feed a character with known length void HandleOneChar(const char* aStr, PRUint32 aCharLen) @@ -68,7 +68,7 @@ public: mFreqChars++; } } - }; + } //return confidence base on existing data float GetConfidence(); @@ -79,21 +79,21 @@ public: mDone = PR_FALSE; mTotalChars = 0; mFreqChars = 0; - }; + } //This function is for future extension. Caller can use this function to control //analyser's behavior - void SetOpion(){}; + void SetOpion(){} //It is not necessary to receive all data to draw conclusion. For charset detection, // certain amount of data is enough - PRBool GotEnoughData() {return mTotalChars > ENOUGH_DATA_THRESHOLD;}; + PRBool GotEnoughData() {return mTotalChars > ENOUGH_DATA_THRESHOLD;} protected: //we do not handle character base on its original encoding string, but //convert this encoding string to a number, here called order. //This allow multiple encoding of a language to share one frequency table - virtual PRInt32 GetOrder(const char* str) {return -1;}; + virtual PRInt32 GetOrder(const char* str) {return -1;} //If this flag is set to PR_TRUE, detection is done and conclusion has been made PRBool mDone; @@ -131,7 +131,7 @@ protected: return 94*((unsigned char)str[0]-(unsigned char)0xc4) + (unsigned char)str[1] - (unsigned char)0xa1; else return -1; - }; + } }; @@ -149,7 +149,7 @@ protected: return 94*((unsigned char)str[0]-(unsigned char)0xb0) + (unsigned char)str[1] - (unsigned char)0xa1; else return -1; - }; + } }; class GB2312DistributionAnalysis : public CharDistributionAnalysis @@ -166,7 +166,7 @@ protected: return 94*((unsigned char)str[0]-(unsigned char)0xb0) + (unsigned char)str[1] - (unsigned char)0xa1; else return -1; - }; + } }; @@ -187,7 +187,7 @@ protected: return 157*((unsigned char)str[0]-(unsigned char)0xa4) + (unsigned char)str[1] - (unsigned char)0x40; else return -1; - }; + } }; class SJISDistributionAnalysis : public CharDistributionAnalysis @@ -212,7 +212,7 @@ protected: if ((unsigned char)str[1] > (unsigned char)0x7f) order--; return order; - }; + } }; class EUCJPDistributionAnalysis : public CharDistributionAnalysis @@ -229,7 +229,7 @@ protected: return 94*((unsigned char)str[0]-(unsigned char)0xa1) + (unsigned char)str[1] - (unsigned char)0xa1; else return -1; - }; + } }; #endif //CharDistribution_h__ diff --git a/mozilla/extensions/universalchardet/src/base/JpCntx.h b/mozilla/extensions/universalchardet/src/base/JpCntx.h index 08e0511c472..1760b752ac7 100644 --- a/mozilla/extensions/universalchardet/src/base/JpCntx.h +++ b/mozilla/extensions/universalchardet/src/base/JpCntx.h @@ -51,7 +51,7 @@ extern char jp2CharContext[83][83]; class JapaneseContextAnalysis { public: - JapaneseContextAnalysis() {Reset();}; + JapaneseContextAnalysis() {Reset();} void HandleData(const char* aBuf, PRUint32 aLen); @@ -72,12 +72,12 @@ public: mRelSample[jp2CharContext[mLastCharOrder][order]]++; } mLastCharOrder = order; - }; + } float GetConfidence(); void Reset(void); - void SetOpion(){}; - PRBool GotEnoughData() {return mTotalRel > ENOUGH_REL_THRESHOLD;}; + void SetOpion(){} + PRBool GotEnoughData() {return mTotalRel > ENOUGH_REL_THRESHOLD;} protected: virtual PRInt32 GetOrder(const char* str, PRUint32 *charLen) = 0; @@ -115,7 +115,7 @@ protected: (unsigned char)*(str+1) <= (unsigned char)0xf1) return (unsigned char)*(str+1) - (unsigned char)0x9f; return -1; - }; + } }; class EUCJPContextAnalysis : public JapaneseContextAnalysis @@ -130,7 +130,7 @@ protected: (unsigned char)*(str+1) <= (unsigned char)0xf3) return (unsigned char)*(str+1) - (unsigned char)0xa1; return -1; - }; + } }; #endif /* __JPCNTX_H__ */ diff --git a/mozilla/extensions/universalchardet/src/base/nsBig5Prober.h b/mozilla/extensions/universalchardet/src/base/nsBig5Prober.h index a80d1a0a8a0..188c6d7618f 100644 --- a/mozilla/extensions/universalchardet/src/base/nsBig5Prober.h +++ b/mozilla/extensions/universalchardet/src/base/nsBig5Prober.h @@ -45,14 +45,14 @@ class nsBig5Prober: public nsCharSetProber { public: nsBig5Prober(void){mCodingSM = new nsCodingStateMachine(&Big5SMModel); - Reset();}; - virtual ~nsBig5Prober(void){delete mCodingSM;}; + Reset();} + virtual ~nsBig5Prober(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "Big5";}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return "Big5";} + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} protected: void GetDistribution(PRUint32 aCharLen, const char* aStr); diff --git a/mozilla/extensions/universalchardet/src/base/nsCharSetProber.h b/mozilla/extensions/universalchardet/src/base/nsCharSetProber.h index 931584880da..c078ccf0810 100644 --- a/mozilla/extensions/universalchardet/src/base/nsCharSetProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsCharSetProber.h @@ -52,7 +52,7 @@ typedef enum { class nsCharSetProber { public: - virtual ~nsCharSetProber() {}; + virtual ~nsCharSetProber() {} virtual const char* GetCharSetName() = 0; virtual nsProbingState HandleData(const char* aBuf, PRUint32 aLen) = 0; virtual nsProbingState GetState(void) = 0; diff --git a/mozilla/extensions/universalchardet/src/base/nsCodingStateMachine.h b/mozilla/extensions/universalchardet/src/base/nsCodingStateMachine.h index b05723eade3..b9c2f64b851 100644 --- a/mozilla/extensions/universalchardet/src/base/nsCodingStateMachine.h +++ b/mozilla/extensions/universalchardet/src/base/nsCodingStateMachine.h @@ -62,7 +62,7 @@ public: nsCodingStateMachine(SMModel* sm){ mCurrentState = eStart; mModel = sm; - }; + } nsSMState NextState(char c){ //for each byte we get its class , if it is first byte, we also get byte length PRUint32 byteCls = GETCLASS(c); @@ -76,10 +76,10 @@ public: mModel->stateTable); mCurrentBytePos++; return mCurrentState; - }; - PRUint32 GetCurrentCharLen(void) {return mCurrentCharLen;}; - void Reset(void) {mCurrentState = eStart;}; - const char * GetCodingStateMachine() {return mModel->name;}; + } + PRUint32 GetCurrentCharLen(void) {return mCurrentCharLen;} + void Reset(void) {mCurrentState = eStart;} + const char * GetCodingStateMachine() {return mModel->name;} protected: nsSMState mCurrentState; diff --git a/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.h b/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.h index 3ae6cfd9f12..05974e214c3 100644 --- a/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.h @@ -51,14 +51,14 @@ class nsEUCJPProber: public nsCharSetProber { public: nsEUCJPProber(void){mCodingSM = new nsCodingStateMachine(&EUCJPSMModel); - Reset();}; - virtual ~nsEUCJPProber(void){delete mCodingSM;}; + Reset();} + virtual ~nsEUCJPProber(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "EUC-JP";}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return "EUC-JP";} + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} protected: nsCodingStateMachine* mCodingSM; diff --git a/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.h b/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.h index 1f3dec5113a..959584cd843 100644 --- a/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.h @@ -45,14 +45,14 @@ class nsEUCKRProber: public nsCharSetProber { public: nsEUCKRProber(void){mCodingSM = new nsCodingStateMachine(&EUCKRSMModel); - Reset();}; - virtual ~nsEUCKRProber(void){delete mCodingSM;}; + Reset();} + virtual ~nsEUCKRProber(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "EUC-KR";}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return "EUC-KR";} + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} protected: void GetDistribution(PRUint32 aCharLen, const char* aStr); diff --git a/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h b/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h index 89100a56867..cd4a4aff482 100644 --- a/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h @@ -45,14 +45,14 @@ class nsEUCTWProber: public nsCharSetProber { public: nsEUCTWProber(void){mCodingSM = new nsCodingStateMachine(&EUCTWSMModel); - Reset();}; - virtual ~nsEUCTWProber(void){delete mCodingSM;}; + Reset();} + virtual ~nsEUCTWProber(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "x-euc-tw";}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return "x-euc-tw";} + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} protected: void GetDistribution(PRUint32 aCharLen, const char* aStr); diff --git a/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.h b/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.h index 5df54279b3c..c08f4420e46 100644 --- a/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.h @@ -48,11 +48,11 @@ public: nsEscCharSetProber(void); virtual ~nsEscCharSetProber(void); nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return mDetectedCharset;}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return mDetectedCharset;} + nsProbingState GetState(void) {return mState;} void Reset(void); - float GetConfidence(void){return (float)0.99;}; - void SetOpion() {}; + float GetConfidence(void){return (float)0.99;} + void SetOpion() {} protected: void GetDistribution(PRUint32 aCharLen, const char* aStr); diff --git a/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h b/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h index c11dd31586e..be01907886e 100644 --- a/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h +++ b/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h @@ -47,14 +47,14 @@ class nsGB18030Prober: public nsCharSetProber { public: nsGB18030Prober(void){mCodingSM = new nsCodingStateMachine(&GB18030SMModel); - Reset();}; - virtual ~nsGB18030Prober(void){delete mCodingSM;}; + Reset();} + virtual ~nsGB18030Prober(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "gb18030";}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return "gb18030";} + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} protected: void GetDistribution(PRUint32 aCharLen, const char* aStr); diff --git a/mozilla/extensions/universalchardet/src/base/nsHebrewProber.h b/mozilla/extensions/universalchardet/src/base/nsHebrewProber.h index 9bb3a003249..eedfed45bfc 100644 --- a/mozilla/extensions/universalchardet/src/base/nsHebrewProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsHebrewProber.h @@ -55,7 +55,7 @@ public: virtual nsProbingState GetState(void); virtual float GetConfidence(void) { return (float)0.0; } - virtual void SetOpion() {}; + virtual void SetOpion() {} void SetModelProbers(nsCharSetProber *logicalPrb, nsCharSetProber *visualPrb) { mLogicalProb = logicalPrb; mVisualProb = visualPrb; } diff --git a/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h b/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h index 103d271b086..5145e9655a2 100644 --- a/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h +++ b/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h @@ -45,14 +45,14 @@ class nsLatin1Prober: public nsCharSetProber { public: - nsLatin1Prober(void){Reset();}; - virtual ~nsLatin1Prober(void){}; + nsLatin1Prober(void){Reset();} + virtual ~nsLatin1Prober(void){} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "windows-1252";}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return "windows-1252";} + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} #ifdef DEBUG_chardet virtual void DumpStatus(); diff --git a/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.h b/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.h index 9eeecc291b9..7c069f2bddc 100644 --- a/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.h @@ -55,10 +55,10 @@ public: virtual ~nsMBCSGroupProber(); nsProbingState HandleData(const char* aBuf, PRUint32 aLen); const char* GetCharSetName(); - nsProbingState GetState(void) {return mState;}; + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} #ifdef DEBUG_chardet void DumpStatus(); diff --git a/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.h b/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.h index 56a8e1c21e7..faa57ed1497 100644 --- a/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.h @@ -49,10 +49,10 @@ public: virtual ~nsSBCSGroupProber(); nsProbingState HandleData(const char* aBuf, PRUint32 aLen); const char* GetCharSetName(); - nsProbingState GetState(void) {return mState;}; + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} #ifdef DEBUG_chardet void DumpStatus(); diff --git a/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.h b/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.h index 82117e2515e..277ab07183a 100644 --- a/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.h @@ -68,10 +68,10 @@ public: virtual const char* GetCharSetName(); virtual nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - virtual nsProbingState GetState(void) {return mState;}; + virtual nsProbingState GetState(void) {return mState;} virtual void Reset(void); virtual float GetConfidence(void); - virtual void SetOpion() {}; + virtual void SetOpion() {} // This feature is not implemented yet. any current language model // contain this parameter as PR_FALSE. No one is looking at this @@ -79,7 +79,7 @@ public: // Moreover, the nsSBCSGroupProber which calls the HandleData of this // prober has a hard-coded call to FilterWithoutEnglishLetters which gets rid // of the English letters. - PRBool KeepEnglishLetters() {return mModel->keepEnglishLetter;}; // (not implemented) + PRBool KeepEnglishLetters() {return mModel->keepEnglishLetter;} // (not implemented) #ifdef DEBUG_chardet virtual void DumpStatus(); diff --git a/mozilla/extensions/universalchardet/src/base/nsSJISProber.h b/mozilla/extensions/universalchardet/src/base/nsSJISProber.h index 3a612d78834..759cca606cf 100644 --- a/mozilla/extensions/universalchardet/src/base/nsSJISProber.h +++ b/mozilla/extensions/universalchardet/src/base/nsSJISProber.h @@ -52,14 +52,14 @@ class nsSJISProber: public nsCharSetProber { public: nsSJISProber(void){mCodingSM = new nsCodingStateMachine(&SJISSMModel); - Reset();}; - virtual ~nsSJISProber(void){delete mCodingSM;}; + Reset();} + virtual ~nsSJISProber(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "Shift_JIS";}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return "Shift_JIS";} + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} protected: nsCodingStateMachine* mCodingSM; diff --git a/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.h b/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.h index 9ead2236f3e..21c91c42a0c 100644 --- a/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.h +++ b/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.h @@ -45,14 +45,14 @@ class nsUTF8Prober: public nsCharSetProber { public: nsUTF8Prober(){mNumOfMBChar = 0; mCodingSM = new nsCodingStateMachine(&UTF8SMModel); - Reset(); }; - virtual ~nsUTF8Prober(){delete mCodingSM;}; + Reset(); } + virtual ~nsUTF8Prober(){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "UTF-8";}; - nsProbingState GetState(void) {return mState;}; + const char* GetCharSetName() {return "UTF-8";} + nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); - void SetOpion() {}; + void SetOpion() {} protected: nsCodingStateMachine* mCodingSM; diff --git a/mozilla/extensions/xmlextras/pointers/src/nsXPointer.cpp b/mozilla/extensions/xmlextras/pointers/src/nsXPointer.cpp index 6a902c4e9a2..81706298e8d 100755 --- a/mozilla/extensions/xmlextras/pointers/src/nsXPointer.cpp +++ b/mozilla/extensions/xmlextras/pointers/src/nsXPointer.cpp @@ -192,8 +192,8 @@ static nsresult NS_NewXPointerResult(nsIDOMNode *aNode, class nsXPointerSchemeContext : public nsIXPointerSchemeContext { public: - nsXPointerSchemeContext() {}; - virtual ~nsXPointerSchemeContext() {}; + nsXPointerSchemeContext() {} + virtual ~nsXPointerSchemeContext() {} NS_DECL_ISUPPORTS NS_DECL_NSIXPOINTERSCHEMECONTEXT diff --git a/mozilla/gfx/thebes/src/gfxFont.cpp b/mozilla/gfx/thebes/src/gfxFont.cpp index 1c1c068ce80..a0a99b6f505 100644 --- a/mozilla/gfx/thebes/src/gfxFont.cpp +++ b/mozilla/gfx/thebes/src/gfxFont.cpp @@ -344,7 +344,7 @@ struct ResolveData { mCallback(aCallback), mGenericFamily(aGenericFamily), mClosure(aClosure) { - }; + } gfxFontGroup::FontCreationCallback mCallback; nsCString mGenericFamily; void *mClosure; diff --git a/mozilla/intl/chardet/src/nsCyrillicDetector.h b/mozilla/intl/chardet/src/nsCyrillicDetector.h index 9ed29544fdd..44b2c35f90d 100644 --- a/mozilla/intl/chardet/src/nsCyrillicDetector.h +++ b/mozilla/intl/chardet/src/nsCyrillicDetector.h @@ -98,8 +98,8 @@ class nsCyrillicDetector for(PRUintn i=0;i mWebShellSvc; PRBool mNotifyByReload; @@ -119,8 +119,8 @@ class nsDetectionAdaptor : // really don't care the following two, only because they are defined // in nsIParserFilter.h - NS_IMETHOD WillAddToken(CToken & token) { return NS_OK; }; - NS_IMETHOD ProcessTokens( void ) {return NS_OK;}; + NS_IMETHOD WillAddToken(CToken & token) { return NS_OK; } + NS_IMETHOD ProcessTokens( void ) {return NS_OK;} private: nsCOMPtr mDetector; diff --git a/mozilla/intl/chardet/src/nsObserverBase.h b/mozilla/intl/chardet/src/nsObserverBase.h index b7b4aa58455..c78cf1bf8a4 100644 --- a/mozilla/intl/chardet/src/nsObserverBase.h +++ b/mozilla/intl/chardet/src/nsObserverBase.h @@ -48,8 +48,8 @@ class nsObserverBase { public: - nsObserverBase() {}; - virtual ~nsObserverBase() {}; + nsObserverBase() {} + virtual ~nsObserverBase() {} /* * Subject call observer when the parser hit the tag diff --git a/mozilla/intl/chardet/src/nsPSMDetectors.h b/mozilla/intl/chardet/src/nsPSMDetectors.h index 02f10a250be..3d04226f5ca 100644 --- a/mozilla/intl/chardet/src/nsPSMDetectors.h +++ b/mozilla/intl/chardet/src/nsPSMDetectors.h @@ -222,7 +222,7 @@ class nsEUCSampler { class nsPSMDetector { public : nsPSMDetector(PRUint8 aItems, nsVerifier* const * aVerifierSet, nsEUCStatistics* const * aStatisticsSet); - virtual ~nsPSMDetector() {}; + virtual ~nsPSMDetector() {} virtual PRBool HandleData(const char* aBuf, PRUint32 aLen); virtual void DataEnd(); @@ -292,84 +292,84 @@ class nsJAPSMDetector : public nsXPCOMDetector { public: nsJAPSMDetector() - : nsXPCOMDetector(JA_DETECTOR_NUM_VERIFIERS, gJaVerifierSet, nsnull) {}; + : nsXPCOMDetector(JA_DETECTOR_NUM_VERIFIERS, gJaVerifierSet, nsnull) {} }; class nsJAStringPSMDetector : public nsXPCOMStringDetector { public: nsJAStringPSMDetector() - : nsXPCOMStringDetector(JA_DETECTOR_NUM_VERIFIERS - 3, gJaVerifierSet, nsnull) {}; + : nsXPCOMStringDetector(JA_DETECTOR_NUM_VERIFIERS - 3, gJaVerifierSet, nsnull) {} }; class nsKOPSMDetector : public nsXPCOMDetector { public: nsKOPSMDetector() - : nsXPCOMDetector(KO_DETECTOR_NUM_VERIFIERS, gKoVerifierSet, nsnull){}; + : nsXPCOMDetector(KO_DETECTOR_NUM_VERIFIERS, gKoVerifierSet, nsnull){} }; class nsKOStringPSMDetector : public nsXPCOMStringDetector { public: nsKOStringPSMDetector() - : nsXPCOMStringDetector(KO_DETECTOR_NUM_VERIFIERS - 3, gKoVerifierSet, nsnull) {}; + : nsXPCOMStringDetector(KO_DETECTOR_NUM_VERIFIERS - 3, gKoVerifierSet, nsnull) {} }; class nsZHTWPSMDetector : public nsXPCOMDetector { public: nsZHTWPSMDetector() - : nsXPCOMDetector(ZHTW_DETECTOR_NUM_VERIFIERS, gZhTwVerifierSet, gZhTwStatisticsSet) {}; + : nsXPCOMDetector(ZHTW_DETECTOR_NUM_VERIFIERS, gZhTwVerifierSet, gZhTwStatisticsSet) {} }; class nsZHTWStringPSMDetector : public nsXPCOMStringDetector { public: nsZHTWStringPSMDetector() - : nsXPCOMStringDetector(ZHTW_DETECTOR_NUM_VERIFIERS - 3, gZhTwVerifierSet, gZhTwStatisticsSet) {}; + : nsXPCOMStringDetector(ZHTW_DETECTOR_NUM_VERIFIERS - 3, gZhTwVerifierSet, gZhTwStatisticsSet) {} }; class nsZHCNPSMDetector : public nsXPCOMDetector { public: nsZHCNPSMDetector() - : nsXPCOMDetector(ZHCN_DETECTOR_NUM_VERIFIERS, gZhCnVerifierSet, nsnull) {}; + : nsXPCOMDetector(ZHCN_DETECTOR_NUM_VERIFIERS, gZhCnVerifierSet, nsnull) {} }; class nsZHCNStringPSMDetector : public nsXPCOMStringDetector { public: nsZHCNStringPSMDetector() - : nsXPCOMStringDetector(ZHCN_DETECTOR_NUM_VERIFIERS - 3, gZhCnVerifierSet, nsnull) {}; + : nsXPCOMStringDetector(ZHCN_DETECTOR_NUM_VERIFIERS - 3, gZhCnVerifierSet, nsnull) {} }; class nsZHPSMDetector : public nsXPCOMDetector { public: nsZHPSMDetector() - : nsXPCOMDetector(ZH_DETECTOR_NUM_VERIFIERS, gZhVerifierSet, gZhStatisticsSet) {}; + : nsXPCOMDetector(ZH_DETECTOR_NUM_VERIFIERS, gZhVerifierSet, gZhStatisticsSet) {} }; class nsZHStringPSMDetector : public nsXPCOMStringDetector { public: nsZHStringPSMDetector() - : nsXPCOMStringDetector(ZH_DETECTOR_NUM_VERIFIERS - 3, gZhVerifierSet, gZhStatisticsSet) {}; + : nsXPCOMStringDetector(ZH_DETECTOR_NUM_VERIFIERS - 3, gZhVerifierSet, gZhStatisticsSet) {} }; class nsCJKPSMDetector : public nsXPCOMDetector { public: nsCJKPSMDetector() - : nsXPCOMDetector(CJK_DETECTOR_NUM_VERIFIERS, gCJKVerifierSet, gCJKStatisticsSet) {}; + : nsXPCOMDetector(CJK_DETECTOR_NUM_VERIFIERS, gCJKVerifierSet, gCJKStatisticsSet) {} }; class nsCJKStringPSMDetector : public nsXPCOMStringDetector { public: nsCJKStringPSMDetector() - : nsXPCOMStringDetector(CJK_DETECTOR_NUM_VERIFIERS - 3, gCJKVerifierSet, gCJKStatisticsSet) {}; + : nsXPCOMStringDetector(CJK_DETECTOR_NUM_VERIFIERS - 3, gCJKVerifierSet, gCJKStatisticsSet) {} }; #endif // nsPSMDetectors_h__ diff --git a/mozilla/intl/locale/src/nsCollation.h b/mozilla/intl/locale/src/nsCollation.h index 0f753aec8be..6986c1de7be 100644 --- a/mozilla/intl/locale/src/nsCollation.h +++ b/mozilla/intl/locale/src/nsCollation.h @@ -55,7 +55,7 @@ public: NS_IMETHOD CreateCollation(nsILocale* locale, nsICollation** instancePtr); - nsCollationFactory() {}; + nsCollationFactory() {} }; diff --git a/mozilla/intl/uconv/src/nsUTF8ConverterService.h b/mozilla/intl/uconv/src/nsUTF8ConverterService.h index d1e91d14416..f555d626a6f 100644 --- a/mozilla/intl/uconv/src/nsUTF8ConverterService.h +++ b/mozilla/intl/uconv/src/nsUTF8ConverterService.h @@ -46,8 +46,8 @@ class nsUTF8ConverterService: public nsIUTF8ConverterService { NS_DECL_NSIUTF8CONVERTERSERVICE public: - nsUTF8ConverterService() {}; - virtual ~nsUTF8ConverterService() {}; + nsUTF8ConverterService() {} + virtual ~nsUTF8ConverterService() {} }; #endif // nsUTF8ConverterService_h__ diff --git a/mozilla/intl/uconv/src/nsUnicodeToUTF8.h b/mozilla/intl/uconv/src/nsUnicodeToUTF8.h index b13f65071e5..92b44b284c6 100644 --- a/mozilla/intl/uconv/src/nsUnicodeToUTF8.h +++ b/mozilla/intl/uconv/src/nsUnicodeToUTF8.h @@ -66,7 +66,7 @@ public: /** * Class constructor. */ - nsUnicodeToUTF8() {mHighSurrogate = 0;}; + nsUnicodeToUTF8() {mHighSurrogate = 0;} NS_IMETHOD FillInfo(PRUint32* aInfo); @@ -83,7 +83,7 @@ public: NS_IMETHOD Reset() {mHighSurrogate = 0; return NS_OK;} NS_IMETHOD SetOutputErrorBehavior(PRInt32 aBehavior, - nsIUnicharEncoder * aEncoder, PRUnichar aChar) {return NS_OK;}; + nsIUnicharEncoder * aEncoder, PRUnichar aChar) {return NS_OK;} protected: PRUnichar mHighSurrogate; diff --git a/mozilla/intl/uconv/ucvcn/nsCP936ToUnicode.h b/mozilla/intl/uconv/ucvcn/nsCP936ToUnicode.h index a867fe113bf..478159e7586 100644 --- a/mozilla/intl/uconv/ucvcn/nsCP936ToUnicode.h +++ b/mozilla/intl/uconv/ucvcn/nsCP936ToUnicode.h @@ -56,7 +56,7 @@ public: /** * Class constructor. */ - nsCP936ToUnicode(){}; + nsCP936ToUnicode(){} }; diff --git a/mozilla/intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h b/mozilla/intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h index 3852f07c9ce..abed8ec704e 100644 --- a/mozilla/intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h +++ b/mozilla/intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h @@ -57,7 +57,7 @@ public: /** * Class constructor. */ - nsGB2312ToUnicodeV2(){}; + nsGB2312ToUnicodeV2(){} }; diff --git a/mozilla/intl/uconv/ucvcn/nsGBKConvUtil.h b/mozilla/intl/uconv/ucvcn/nsGBKConvUtil.h index 94c568ed859..cdec601fd3d 100644 --- a/mozilla/intl/uconv/ucvcn/nsGBKConvUtil.h +++ b/mozilla/intl/uconv/ucvcn/nsGBKConvUtil.h @@ -40,8 +40,8 @@ #include "nscore.h" class nsGBKConvUtil { public: - nsGBKConvUtil() { }; - ~nsGBKConvUtil() { }; + nsGBKConvUtil() { } + ~nsGBKConvUtil() { } void InitToGBKTable(); PRUnichar GBKCharToUnicode(char aByte1, char aByte2); PRBool UnicodeToGBKChar(PRUnichar aChar, PRBool aToGL, diff --git a/mozilla/intl/uconv/ucvcn/nsGBKToUnicode.cpp b/mozilla/intl/uconv/ucvcn/nsGBKToUnicode.cpp index f95cca3a3b4..186f738edd4 100644 --- a/mozilla/intl/uconv/ucvcn/nsGBKToUnicode.cpp +++ b/mozilla/intl/uconv/ucvcn/nsGBKToUnicode.cpp @@ -55,7 +55,7 @@ class nsGBKUnique2BytesToUnicode : public nsTableDecoderSupport public: nsGBKUnique2BytesToUnicode(); virtual ~nsGBKUnique2BytesToUnicode() - { }; + { } protected: }; @@ -76,7 +76,7 @@ class nsGB18030Unique2BytesToUnicode : public nsTableDecoderSupport public: nsGB18030Unique2BytesToUnicode(); virtual ~nsGB18030Unique2BytesToUnicode() - { }; + { } protected: }; @@ -97,7 +97,7 @@ class nsGB18030Unique4BytesToUnicode : public nsTableDecoderSupport public: nsGB18030Unique4BytesToUnicode(); virtual ~nsGB18030Unique4BytesToUnicode() - { }; + { } protected: }; diff --git a/mozilla/intl/uconv/ucvcn/nsGBKToUnicode.h b/mozilla/intl/uconv/ucvcn/nsGBKToUnicode.h index 2a700214a47..694ebb67c37 100644 --- a/mozilla/intl/uconv/ucvcn/nsGBKToUnicode.h +++ b/mozilla/intl/uconv/ucvcn/nsGBKToUnicode.h @@ -63,7 +63,7 @@ public: { mExtensionDecoder = nsnull; m4BytesDecoder = nsnull; - }; + } protected: @@ -88,8 +88,8 @@ protected: class nsGB18030ToUnicode : public nsGBKToUnicode { public: - nsGB18030ToUnicode() {}; - virtual ~nsGB18030ToUnicode() {}; + nsGB18030ToUnicode() {} + virtual ~nsGB18030ToUnicode() {} protected: virtual void CreateExtensionDecoder(); virtual void Create4BytesDecoder(); diff --git a/mozilla/intl/uconv/ucvcn/nsISO2022CNToUnicode.h b/mozilla/intl/uconv/ucvcn/nsISO2022CNToUnicode.h index 34a11c1cf1c..b5e87b1420a 100644 --- a/mozilla/intl/uconv/ucvcn/nsISO2022CNToUnicode.h +++ b/mozilla/intl/uconv/ucvcn/nsISO2022CNToUnicode.h @@ -56,9 +56,9 @@ class nsISO2022CNToUnicode : public nsBasicDecoderSupport public: nsISO2022CNToUnicode() : mState(eState_ASCII), - mPlaneID(0) { }; + mPlaneID(0) { } - virtual ~nsISO2022CNToUnicode() {}; + virtual ~nsISO2022CNToUnicode() {} NS_IMETHOD Convert(const char *aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength) ; @@ -68,7 +68,7 @@ public: { *aDestLength = aSrcLength; return NS_OK; - }; + } NS_IMETHOD Reset() { @@ -76,7 +76,7 @@ public: mPlaneID = 0; return NS_OK; - }; + } private: // State Machine ID diff --git a/mozilla/intl/uconv/ucvcn/nsUnicodeToCP936.h b/mozilla/intl/uconv/ucvcn/nsUnicodeToCP936.h index f81b69b327b..3ce98e42144 100644 --- a/mozilla/intl/uconv/ucvcn/nsUnicodeToCP936.h +++ b/mozilla/intl/uconv/ucvcn/nsUnicodeToCP936.h @@ -56,7 +56,7 @@ public: /** * Class constructor. */ - nsUnicodeToCP936() {}; + nsUnicodeToCP936() {} }; diff --git a/mozilla/intl/uconv/ucvcn/nsUnicodeToGB2312GL.h b/mozilla/intl/uconv/ucvcn/nsUnicodeToGB2312GL.h index eb51c114121..aae24737f2f 100644 --- a/mozilla/intl/uconv/ucvcn/nsUnicodeToGB2312GL.h +++ b/mozilla/intl/uconv/ucvcn/nsUnicodeToGB2312GL.h @@ -73,7 +73,7 @@ protected: char * aDest, PRInt32 * aDestLength) { return NS_OK; - }; // just make it not abstract; + } // just make it not abstract; NS_IMETHOD FillInfo(PRUint32 *aInfo); protected: diff --git a/mozilla/intl/uconv/ucvcn/nsUnicodeToGB2312V2.h b/mozilla/intl/uconv/ucvcn/nsUnicodeToGB2312V2.h index 10ccccd63ae..74f39c28a1a 100644 --- a/mozilla/intl/uconv/ucvcn/nsUnicodeToGB2312V2.h +++ b/mozilla/intl/uconv/ucvcn/nsUnicodeToGB2312V2.h @@ -73,7 +73,7 @@ protected: char * aDest, PRInt32 * aDestLength) { return NS_OK; - }; // just make it not abstract; + } // just make it not abstract; NS_IMETHOD FillInfo(PRUint32 *aInfo); protected: diff --git a/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp b/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp index 0609b75dcd9..73ce318debb 100644 --- a/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp +++ b/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.cpp @@ -68,7 +68,7 @@ class nsUnicodeToGB18030Uniq2Bytes : public nsTableEncoderSupport public: nsUnicodeToGB18030Uniq2Bytes() : nsTableEncoderSupport(u2BytesCharset, - (uMappingTable*) &g_uf_gb18030_2bytes, 2) {}; + (uMappingTable*) &g_uf_gb18030_2bytes, 2) {} protected: }; //----------------------------------------------------------------------- @@ -83,7 +83,7 @@ class nsUnicodeTo4BytesGB18030 : public nsTableEncoderSupport public: nsUnicodeTo4BytesGB18030() : nsTableEncoderSupport(u4BytesGB18030Charset, - (uMappingTable*) &g_uf_gb18030_4bytes, 4) {}; + (uMappingTable*) &g_uf_gb18030_4bytes, 4) {} protected: }; //----------------------------------------------------------------------- @@ -98,7 +98,7 @@ class nsUnicodeToGBKUniq2Bytes : public nsTableEncoderSupport public: nsUnicodeToGBKUniq2Bytes() : nsTableEncoderSupport(u2BytesCharset, - (uMappingTable*) &g_uf_gbk_2bytes, 2) {}; + (uMappingTable*) &g_uf_gbk_2bytes, 2) {} protected: }; //----------------------------------------------------------------------- diff --git a/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.h b/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.h index 02d5c0a426e..dcb2ca9dc75 100644 --- a/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.h +++ b/mozilla/intl/uconv/ucvcn/nsUnicodeToGBK.h @@ -61,7 +61,7 @@ public: * Class constructor. */ nsUnicodeToGBK(PRUint32 aMaxLengthFactor = 2); - virtual ~nsUnicodeToGBK() {}; + virtual ~nsUnicodeToGBK() {} protected: @@ -76,7 +76,7 @@ protected: char * aDest, PRInt32 * aDestLength) { return NS_OK; - }; // just make it not abstract; + } // just make it not abstract; NS_IMETHOD FillInfo(PRUint32 *aInfo); @@ -96,8 +96,8 @@ protected: class nsUnicodeToGB18030: public nsUnicodeToGBK { public: - nsUnicodeToGB18030() : nsUnicodeToGBK(4) {}; - virtual ~nsUnicodeToGB18030() {}; + nsUnicodeToGB18030() : nsUnicodeToGBK(4) {} + virtual ~nsUnicodeToGB18030() {} protected: virtual void CreateExtensionEncoder(); virtual void Create4BytesEncoder(); @@ -108,8 +108,8 @@ protected: class nsUnicodeToGB18030Font0: public nsUnicodeToGB18030 { public: - nsUnicodeToGB18030Font0() {}; - virtual ~nsUnicodeToGB18030Font0() {}; + nsUnicodeToGB18030Font0() {} + virtual ~nsUnicodeToGB18030Font0() {} protected: virtual void Create4BytesEncoder(); NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, @@ -120,7 +120,7 @@ class nsUnicodeToGB18030Font1 : public nsTableEncoderSupport { public: nsUnicodeToGB18030Font1(); - virtual ~nsUnicodeToGB18030Font1() {}; + virtual ~nsUnicodeToGB18030Font1() {} protected: NS_IMETHOD FillInfo(PRUint32 *aInfo); }; diff --git a/mozilla/intl/uconv/ucvcn/nsUnicodeToHZ.h b/mozilla/intl/uconv/ucvcn/nsUnicodeToHZ.h index ecbaa0dfe5e..28acd5ca341 100644 --- a/mozilla/intl/uconv/ucvcn/nsUnicodeToHZ.h +++ b/mozilla/intl/uconv/ucvcn/nsUnicodeToHZ.h @@ -77,7 +77,7 @@ protected: char * aDest, PRInt32 * aDestLength) { return NS_OK; - }; // just make it not abstract; + } // just make it not abstract; PRUint16 mHZState; protected: diff --git a/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.h b/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.h index e38c22c5e04..6f35027b0c5 100644 --- a/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.h +++ b/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.h @@ -58,8 +58,8 @@ public: { mState=0; mData=0; setMapMode(); - }; - virtual ~nsShiftJISToUnicode() {}; + } + virtual ~nsShiftJISToUnicode() {} NS_IMETHOD Convert(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength) ; @@ -68,13 +68,13 @@ public: { *aDestLength = aSrcLength; return NS_OK; - }; + } NS_IMETHOD Reset() { mState = 0; setMapMode(); return NS_OK; - }; + } private: @@ -91,8 +91,8 @@ public: { mState=0; mData=0; setMapMode(); - }; - virtual ~nsEUCJPToUnicodeV2() {}; + } + virtual ~nsEUCJPToUnicodeV2() {} NS_IMETHOD Convert(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength) ; @@ -101,13 +101,13 @@ public: { *aDestLength = aSrcLength; return NS_OK; - }; + } NS_IMETHOD Reset() { mState = 0; setMapMode(); return NS_OK; - }; + } private: PRInt32 mState; @@ -128,13 +128,13 @@ public: mEUCKRDecoder = nsnull; mISO88597Decoder = nsnull; setMapMode(); - }; + } virtual ~nsISO2022JPToUnicodeV2() { NS_IF_RELEASE(mGB2312Decoder); NS_IF_RELEASE(mEUCKRDecoder); NS_IF_RELEASE(mISO88597Decoder); - }; + } NS_IMETHOD Convert(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength) ; @@ -143,14 +143,14 @@ public: { *aDestLength = aSrcLength; return NS_OK; - }; + } NS_IMETHOD Reset() { mState = mState_ASCII; mLastLegalState = mState_ASCII; setMapMode(); return NS_OK; - }; + } private: enum { diff --git a/mozilla/intl/uconv/ucvko/nsISO2022KRToUnicode.h b/mozilla/intl/uconv/ucvko/nsISO2022KRToUnicode.h index 8d9bec8468a..206ab8fc26f 100644 --- a/mozilla/intl/uconv/ucvko/nsISO2022KRToUnicode.h +++ b/mozilla/intl/uconv/ucvko/nsISO2022KRToUnicode.h @@ -50,12 +50,12 @@ public: mLastLegalState = mState_ASCII; mData = 0; mEUCKRDecoder = nsnull; - }; + } virtual ~nsISO2022KRToUnicode() { NS_IF_RELEASE(mEUCKRDecoder); - }; + } NS_IMETHOD Convert(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength) ; @@ -65,14 +65,14 @@ public: { *aDestLength = aSrcLength; return NS_OK; - }; + } NS_IMETHOD Reset() { mState = mState_ASCII; mLastLegalState = mState_ASCII; return NS_OK; - }; + } private: enum { diff --git a/mozilla/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h b/mozilla/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h index c13a754b665..c00fc7f1e21 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h +++ b/mozilla/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h @@ -46,7 +46,7 @@ class nsUTF16ToUnicodeBase : public nsBasicDecoderSupport { protected: // ctor accessible only by child classes - nsUTF16ToUnicodeBase() { Reset();}; + nsUTF16ToUnicodeBase() { Reset();} public: //-------------------------------------------------------------------- diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic16.h b/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic16.h index e8a1288ac99..21dad198bba 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic16.h +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic16.h @@ -49,8 +49,8 @@ public: /** * Class constructor. */ - nsUnicodeToLangBoxArabic16() {}; - virtual ~nsUnicodeToLangBoxArabic16() {}; + nsUnicodeToLangBoxArabic16() {} + virtual ~nsUnicodeToLangBoxArabic16() {} NS_IMETHOD Convert( const PRUnichar * aSrc, PRInt32 * aSrcLength, diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.h b/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.h index f00367b56ec..86039f8d146 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.h +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.h @@ -48,8 +48,8 @@ public: /** * Class constructor. */ - nsUnicodeToLangBoxArabic8() {}; - virtual ~nsUnicodeToLangBoxArabic8() {}; + nsUnicodeToLangBoxArabic8() {} + virtual ~nsUnicodeToLangBoxArabic8() {} NS_IMETHOD Convert( const PRUnichar * aSrc, PRInt32 * aSrcLength, diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToTSCII.h b/mozilla/intl/uconv/ucvlatin/nsUnicodeToTSCII.h index f2f3f1daa6b..29d6cfbb85e 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToTSCII.h +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToTSCII.h @@ -55,8 +55,8 @@ class nsUnicodeToTSCII : public nsIUnicodeEncoder, public nsICharRepresentable NS_DECL_ISUPPORTS public: - nsUnicodeToTSCII() { mBuffer = 0; }; - virtual ~nsUnicodeToTSCII() {}; + nsUnicodeToTSCII() { mBuffer = 0; } + virtual ~nsUnicodeToTSCII() {} NS_IMETHOD Convert(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength); @@ -90,8 +90,8 @@ class nsUnicodeToTamilTTF : public nsUnicodeToTSCII NS_DECL_ISUPPORTS_INHERITED public: - nsUnicodeToTamilTTF() : nsUnicodeToTSCII() {}; - virtual ~nsUnicodeToTamilTTF() {}; + nsUnicodeToTamilTTF() : nsUnicodeToTSCII() {} + virtual ~nsUnicodeToTamilTTF() {} NS_IMETHOD Convert (const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength); diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h index f8c06053b36..377c670256d 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h @@ -43,7 +43,7 @@ class nsUnicodeToUTF16BE: public nsBasicEncoder { public: - nsUnicodeToUTF16BE() { mBOM = 0;}; + nsUnicodeToUTF16BE() { mBOM = 0;} //-------------------------------------------------------------------- // Interface nsIUnicodeEncoder [declaration] @@ -69,7 +69,7 @@ protected: class nsUnicodeToUTF16LE: public nsUnicodeToUTF16BE { public: - nsUnicodeToUTF16LE() { mBOM = 0;}; + nsUnicodeToUTF16LE() { mBOM = 0;} protected: NS_IMETHOD CopyData(char* aDest, const PRUnichar* aSrc, PRInt32 aLen ); @@ -86,7 +86,7 @@ class nsUnicodeToUTF16: public nsUnicodeToUTF16BE #endif { public: - nsUnicodeToUTF16() { mBOM = 0xFEFF;}; + nsUnicodeToUTF16() { mBOM = 0xFEFF;} }; #endif /* nsUnicodeToUCS2BE_h___ */ diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUTF32.h b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUTF32.h index a9ee3505c32..2b73fa2bf0b 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUTF32.h +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUTF32.h @@ -60,8 +60,8 @@ public: /** * Class constructor. */ - nsUnicodeToUTF32() {mHighSurrogate = 0;}; - virtual ~nsUnicodeToUTF32() {}; + nsUnicodeToUTF32() {mHighSurrogate = 0;} + virtual ~nsUnicodeToUTF32() {} protected: PRUnichar mHighSurrogate; @@ -72,12 +72,12 @@ protected: //-------------------------------------------------------------------- // Subclassing of nsIUnicodeEncoder class [declaration] - NS_IMETHOD Reset() {mHighSurrogate = 0; return NS_OK;}; + NS_IMETHOD Reset() {mHighSurrogate = 0; return NS_OK;} NS_IMETHOD FillInfo(PRUint32* aInfo); NS_IMETHOD SetOutputErrorBehavior(PRInt32 aBehavior, nsIUnicharEncoder * aEncoder, PRUnichar aChar) - {return NS_OK;}; + {return NS_OK;} }; diff --git a/mozilla/intl/unicharutil/src/nsCaseConversionImp2.h b/mozilla/intl/unicharutil/src/nsCaseConversionImp2.h index 80fd6399b06..e126bd10abb 100644 --- a/mozilla/intl/unicharutil/src/nsCaseConversionImp2.h +++ b/mozilla/intl/unicharutil/src/nsCaseConversionImp2.h @@ -47,7 +47,7 @@ class nsCaseConversionImp2 : public nsICaseConversion { NS_DECL_ISUPPORTS public: - virtual ~nsCaseConversionImp2() { }; + virtual ~nsCaseConversionImp2() { } static nsCaseConversionImp2* GetInstance(); diff --git a/mozilla/intl/unicharutil/util/nsCompressedCharMap.h b/mozilla/intl/unicharutil/util/nsCompressedCharMap.h index 155080410a9..a32ecde04d7 100644 --- a/mozilla/intl/unicharutil/util/nsCompressedCharMap.h +++ b/mozilla/intl/unicharutil/util/nsCompressedCharMap.h @@ -110,7 +110,7 @@ public: PRUint16* NewCCMap(); PRUint16* FillCCMap(PRUint16* aCCMap); - PRUint16 GetSize() {return mUsedLen;}; + PRUint16 GetSize() {return mUsedLen;} void SetChar(PRUint32); void SetChars(PRUint16*); void SetChars(PRUint16, ALU_TYPE*); diff --git a/mozilla/js/src/liveconnect/nsCLiveconnect.cpp b/mozilla/js/src/liveconnect/nsCLiveconnect.cpp index 767cbd5f918..14ce9a781a0 100644 --- a/mozilla/js/src/liveconnect/nsCLiveconnect.cpp +++ b/mozilla/js/src/liveconnect/nsCLiveconnect.cpp @@ -97,7 +97,7 @@ public: ~AutoPushJSContext(); - nsresult ResultOfPush() { return mPushResult; }; + nsresult ResultOfPush() { return mPushResult; } private: nsCOMPtr mContextStack; diff --git a/mozilla/layout/base/nsFrameTraversal.cpp b/mozilla/layout/base/nsFrameTraversal.cpp index 0a0f983ce3a..bc9e50bca4f 100644 --- a/mozilla/layout/base/nsFrameTraversal.cpp +++ b/mozilla/layout/base/nsFrameTraversal.cpp @@ -135,7 +135,7 @@ class nsVisualIterator: public nsFrameIterator public: nsVisualIterator(nsPresContext* aPresContext, nsIFrame *aStart, nsIteratorType aType, PRBool aLockScroll, PRBool aFollowOOFs) : - nsFrameIterator(aPresContext, aStart, aType, aLockScroll, aFollowOOFs) {}; + nsFrameIterator(aPresContext, aStart, aType, aLockScroll, aFollowOOFs) {} protected: nsIFrame* GetFirstChildInner(nsIFrame* aFrame); diff --git a/mozilla/layout/base/nsPresContext.h b/mozilla/layout/base/nsPresContext.h index e2a39a65497..383706defaa 100644 --- a/mozilla/layout/base/nsPresContext.h +++ b/mozilla/layout/base/nsPresContext.h @@ -695,10 +695,10 @@ public: */ const nscoord* GetBorderWidthTable() { return mBorderWidthTable; } - PRBool IsDynamic() { return (mType == eContext_PageLayout || mType == eContext_Galley); }; + PRBool IsDynamic() { return (mType == eContext_PageLayout || mType == eContext_Galley); } PRBool IsScreen() { return (mMedium == nsGkAtoms::screen || mType == eContext_PageLayout || - mType == eContext_PrintPreview); }; + mType == eContext_PrintPreview); } const nsTArray& GetActivePopups() { NS_ASSERTION(this == RootPresContext(), "Only on root prescontext"); diff --git a/mozilla/layout/forms/nsTextControlFrame.h b/mozilla/layout/forms/nsTextControlFrame.h index 3e29f2d8226..b466a3872ef 100644 --- a/mozilla/layout/forms/nsTextControlFrame.h +++ b/mozilla/layout/forms/nsTextControlFrame.h @@ -200,7 +200,7 @@ public: //for methods who access nsTextControlFrame directly void SetFireChangeEventState(PRBool aNewState) { mFireChangeEventState = aNewState; - }; + } PRBool GetFireChangeEventState() const { diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index 066c1dea5e7..4024b24b24f 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -156,7 +156,7 @@ public: private: // The normal operator new is disallowed on nsFrames. - void* operator new(size_t sz) CPP_THROW_NEW { return nsnull; }; + void* operator new(size_t sz) CPP_THROW_NEW { return nsnull; } public: diff --git a/mozilla/layout/generic/nsInlineFrame.h b/mozilla/layout/generic/nsInlineFrame.h index a2c92ef0822..f771905ae43 100644 --- a/mozilla/layout/generic/nsInlineFrame.h +++ b/mozilla/layout/generic/nsInlineFrame.h @@ -169,7 +169,7 @@ protected: mNextInFlow = nsnull; mLineContainer = nsnull; mSetParentPointer = PR_FALSE; - }; + } }; nsInlineFrame(nsStyleContext* aContext) : nsInlineFrameSuper(aContext) {} diff --git a/mozilla/layout/generic/nsObjectFrame.h b/mozilla/layout/generic/nsObjectFrame.h index abd29faecc4..59823057864 100644 --- a/mozilla/layout/generic/nsObjectFrame.h +++ b/mozilla/layout/generic/nsObjectFrame.h @@ -117,7 +117,7 @@ public: NS_IMETHOD GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) { return NS_ERROR_NOT_IMPLEMENTED; - }; + } // accessibility support #ifdef ACCESSIBILITY diff --git a/mozilla/layout/generic/nsSimplePageSequence.h b/mozilla/layout/generic/nsSimplePageSequence.h index 16f1b23948a..535e6e24c2b 100644 --- a/mozilla/layout/generic/nsSimplePageSequence.h +++ b/mozilla/layout/generic/nsSimplePageSequence.h @@ -103,7 +103,7 @@ public: NS_IMETHOD SetTotalNumPages(PRInt32 aTotal) { mTotalPages = aTotal; return NS_OK; } // Gets the dead space (the gray area) around the Print Preview Page - NS_IMETHOD GetDeadSpaceValue(nscoord* aValue) { *aValue = NS_INCHES_TO_TWIPS(0.25); return NS_OK; }; + NS_IMETHOD GetDeadSpaceValue(nscoord* aValue) { *aValue = NS_INCHES_TO_TWIPS(0.25); return NS_OK; } // For Shrink To Fit NS_IMETHOD GetSTFPercent(float& aSTFPercent); diff --git a/mozilla/layout/inspector/src/inDOMView.cpp b/mozilla/layout/inspector/src/inDOMView.cpp index 5134ef1aefa..e0847bb1861 100644 --- a/mozilla/layout/inspector/src/inDOMView.cpp +++ b/mozilla/layout/inspector/src/inDOMView.cpp @@ -68,7 +68,7 @@ class inDOMViewNode { public: - inDOMViewNode() {}; + inDOMViewNode() {} inDOMViewNode(nsIDOMNode* aNode); ~inDOMViewNode(); diff --git a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp index e856ed4028a..1368e4f3335 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp @@ -632,7 +632,7 @@ class nsBaseFontEntry : public PLDHashInt32Entry { public: nsBaseFontEntry(const void* aKey) : PLDHashInt32Entry(aKey) { } - ~nsBaseFontEntry() { }; + ~nsBaseFontEntry() { } nsString mFontFamily; // a font-family list a-la CSS }; diff --git a/mozilla/layout/style/nsCSSValue.h b/mozilla/layout/style/nsCSSValue.h index 2a55d3b5003..b687957142f 100644 --- a/mozilla/layout/style/nsCSSValue.h +++ b/mozilla/layout/style/nsCSSValue.h @@ -162,7 +162,7 @@ public: return !(*this == aOther); } - nsCSSUnit GetUnit() const { return mUnit; }; + nsCSSUnit GetUnit() const { return mUnit; } PRBool IsLengthUnit() const { return PRBool((eCSSUnit_Inch <= mUnit) && (mUnit <= eCSSUnit_Proportional)); } PRBool IsFixedLengthUnit() const diff --git a/mozilla/layout/style/nsIStyleRuleProcessor.h b/mozilla/layout/style/nsIStyleRuleProcessor.h index 9c6ac87b403..8c33d851efb 100644 --- a/mozilla/layout/style/nsIStyleRuleProcessor.h +++ b/mozilla/layout/style/nsIStyleRuleProcessor.h @@ -78,7 +78,7 @@ struct RuleProcessorData { void Destroy(nsPresContext* aContext) { this->~RuleProcessorData(); aContext->FreeToShell(sizeof(RuleProcessorData), this); - }; + } const nsString* GetLang(); diff --git a/mozilla/layout/style/nsRuleData.h b/mozilla/layout/style/nsRuleData.h index d668814b898..2ae3d8dc53d 100644 --- a/mozilla/layout/style/nsRuleData.h +++ b/mozilla/layout/style/nsRuleData.h @@ -83,8 +83,8 @@ struct nsRuleData #ifdef MOZ_SVG mSVGData = nsnull; #endif - }; - ~nsRuleData() {}; + } + ~nsRuleData() {} }; #endif diff --git a/mozilla/layout/style/nsRuleNode.cpp b/mozilla/layout/style/nsRuleNode.cpp index 5a55db8d843..c070036a45d 100644 --- a/mozilla/layout/style/nsRuleNode.cpp +++ b/mozilla/layout/style/nsRuleNode.cpp @@ -88,7 +88,7 @@ public: void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->AllocateFromShell(sz); - }; + } void operator delete(void* aPtr) {} // Does nothing. The arena will free us up when the rule tree // dies. diff --git a/mozilla/layout/style/nsRuleNode.h b/mozilla/layout/style/nsRuleNode.h index ac1b171ce32..e136a60cd7c 100644 --- a/mozilla/layout/style/nsRuleNode.h +++ b/mozilla/layout/style/nsRuleNode.h @@ -76,7 +76,7 @@ struct nsInheritedStyleData void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->AllocateFromShell(sz); - }; + } void ClearInheritedData(PRUint32 aBits) { #define STYLE_STRUCT_INHERITED(name, checkdata_cb, ctor_args) \ @@ -88,7 +88,7 @@ struct nsInheritedStyleData #undef STYLE_STRUCT_INHERITED #undef STYLE_STRUCT_RESET - }; + } void Destroy(PRUint32 aBits, nsPresContext* aContext) { #define STYLE_STRUCT_INHERITED(name, checkdata_cb, ctor_args) \ @@ -102,7 +102,7 @@ struct nsInheritedStyleData #undef STYLE_STRUCT_RESET aContext->FreeToShell(sizeof(nsInheritedStyleData), this); - }; + } nsInheritedStyleData() { #define STYLE_STRUCT_INHERITED(name, checkdata_cb, ctor_args) \ @@ -114,7 +114,7 @@ struct nsInheritedStyleData #undef STYLE_STRUCT_INHERITED #undef STYLE_STRUCT_RESET - }; + } }; struct nsResetStyleData @@ -129,7 +129,7 @@ struct nsResetStyleData #undef STYLE_STRUCT_RESET #undef STYLE_STRUCT_INHERITED - }; + } void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->AllocateFromShell(sz); @@ -145,7 +145,7 @@ struct nsResetStyleData #undef STYLE_STRUCT_RESET #undef STYLE_STRUCT_INHERITED - }; + } void Destroy(PRUint32 aBits, nsPresContext* aContext) { #define STYLE_STRUCT_RESET(name, checkdata_cb, ctor_args) \ @@ -159,7 +159,7 @@ struct nsResetStyleData #undef STYLE_STRUCT_INHERITED aContext->FreeToShell(sizeof(nsResetStyleData), this); - }; + } #define STYLE_STRUCT_RESET(name, checkdata_cb, ctor_args) \ nsStyle##name * m##name##Data; @@ -187,11 +187,11 @@ struct nsCachedStyleData static PRBool IsReset(const nsStyleStructID& aSID) { return gInfo[aSID].mIsReset; - }; + } static PRUint32 GetBitForSID(const nsStyleStructID& aSID) { return 1 << aSID; - }; + } NS_HIDDEN_(nsStyleStruct*) NS_FASTCALL GetStyleData(const nsStyleStructID& aSID) { // Each struct is stored at this.m##type##Data->m##name##Data where @@ -222,7 +222,7 @@ struct nsCachedStyleData data = *NS_REINTERPRET_CAST(nsStyleStruct**, dataSlot); } return data; - }; + } // Typesafe and faster versions of the above #define STYLE_STRUCT_INHERITED(name_, checkdata_cb_, ctor_args_) \ @@ -253,8 +253,8 @@ struct nsCachedStyleData mInheritedData = nsnull; } - nsCachedStyleData() :mInheritedData(nsnull), mResetData(nsnull) {}; - ~nsCachedStyleData() {}; + nsCachedStyleData() :mInheritedData(nsnull), mResetData(nsnull) {} + ~nsCachedStyleData() {} }; /** diff --git a/mozilla/layout/style/nsRuleWalker.h b/mozilla/layout/style/nsRuleWalker.h index 587c3b3bfcc..f443978f65d 100644 --- a/mozilla/layout/style/nsRuleWalker.h +++ b/mozilla/layout/style/nsRuleWalker.h @@ -68,6 +68,6 @@ private: nsRuleNode* mRoot; // The root of the tree we're walking. public: - nsRuleWalker(nsRuleNode* aRoot) :mCurrent(aRoot), mRoot(aRoot) { MOZ_COUNT_CTOR(nsRuleWalker); }; - ~nsRuleWalker() { MOZ_COUNT_DTOR(nsRuleWalker); }; + nsRuleWalker(nsRuleNode* aRoot) :mCurrent(aRoot), mRoot(aRoot) { MOZ_COUNT_CTOR(nsRuleWalker); } + ~nsRuleWalker() { MOZ_COUNT_DTOR(nsRuleWalker); } }; diff --git a/mozilla/layout/style/nsStyleContext.h b/mozilla/layout/style/nsStyleContext.h index a2ad518a6e4..7d1fc6d42b4 100644 --- a/mozilla/layout/style/nsStyleContext.h +++ b/mozilla/layout/style/nsStyleContext.h @@ -107,7 +107,7 @@ public: FindChildWithRules(const nsIAtom* aPseudoTag, nsRuleNode* aRules); NS_HIDDEN_(PRBool) Equals(const nsStyleContext* aOther) const; - PRBool HasTextDecorations() { return mBits & NS_STYLE_HAS_TEXT_DECORATIONS; }; + PRBool HasTextDecorations() { return mBits & NS_STYLE_HAS_TEXT_DECORATIONS; } NS_HIDDEN_(void) SetStyle(nsStyleStructID aSID, nsStyleStruct* aStruct); diff --git a/mozilla/layout/style/nsStyleStruct.h b/mozilla/layout/style/nsStyleStruct.h index 83811a1f026..d0e9a051e6a 100644 --- a/mozilla/layout/style/nsStyleStruct.h +++ b/mozilla/layout/style/nsStyleStruct.h @@ -104,7 +104,7 @@ struct nsStyleFont : public nsStyleStruct { nsStyleFont(const nsFont& aFont); nsStyleFont(const nsStyleFont& aStyleFont); nsStyleFont(nsPresContext *aPresContext); - ~nsStyleFont(void) {}; + ~nsStyleFont(void) {} nsChangeHint CalcDifference(const nsStyleFont& aOther) const; #ifdef DEBUG @@ -129,7 +129,7 @@ struct nsStyleFont : public nsStyleStruct { struct nsStyleColor : public nsStyleStruct { nsStyleColor(nsPresContext* aPresContext); nsStyleColor(const nsStyleColor& aOther); - ~nsStyleColor(void) {}; + ~nsStyleColor(void) {} nsChangeHint CalcDifference(const nsStyleColor& aOther) const; #ifdef DEBUG @@ -142,7 +142,7 @@ struct nsStyleColor : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleColor(); aContext->FreeToShell(sizeof(nsStyleColor), this); - }; + } // Don't add ANY members to this struct! We can achieve caching in the rule // tree (rather than the style tree) by letting color stay by itself! -dwh @@ -160,7 +160,7 @@ struct nsStyleBackground : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleBackground(); aContext->FreeToShell(sizeof(nsStyleBackground), this); - }; + } nsChangeHint CalcDifference(const nsStyleBackground& aOther) const; #ifdef DEBUG @@ -217,7 +217,7 @@ struct nsStyleBackground : public nsStyleStruct { struct nsStyleMargin: public nsStyleStruct { nsStyleMargin(void); nsStyleMargin(const nsStyleMargin& aMargin); - ~nsStyleMargin(void) {}; + ~nsStyleMargin(void) {} void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW; void Destroy(nsPresContext* aContext); @@ -248,7 +248,7 @@ protected: struct nsStylePadding: public nsStyleStruct { nsStylePadding(void); nsStylePadding(const nsStylePadding& aPadding); - ~nsStylePadding(void) {}; + ~nsStylePadding(void) {} void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW; void Destroy(nsPresContext* aContext); @@ -287,7 +287,7 @@ struct nsBorderColors { return new nsBorderColors(mColor, mTransparent, next); } - nsBorderColors() :mNext(nsnull) { mColor = NS_RGB(0,0,0); }; + nsBorderColors() :mNext(nsnull) { mColor = NS_RGB(0,0,0); } nsBorderColors(const nscolor& aColor, PRBool aTransparent, nsBorderColors* aNext=nsnull) { mColor = aColor; @@ -334,7 +334,7 @@ struct nsStyleBorder: public nsStyleStruct { delete mBorderColors[i]; delete []mBorderColors; } - }; + } void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW; void Destroy(nsPresContext* aContext); @@ -509,7 +509,7 @@ protected: struct nsStyleOutline: public nsStyleStruct { nsStyleOutline(nsPresContext* aPresContext); nsStyleOutline(const nsStyleOutline& aOutline); - ~nsStyleOutline(void) {}; + ~nsStyleOutline(void) {} void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->AllocateFromShell(sz); @@ -517,7 +517,7 @@ struct nsStyleOutline: public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleOutline(); aContext->FreeToShell(sizeof(nsStyleOutline), this); - }; + } void RecalcData(nsPresContext* aContext); nsChangeHint CalcDifference(const nsStyleOutline& aOther) const; @@ -618,7 +618,7 @@ struct nsStyleList : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleList(); aContext->FreeToShell(sizeof(nsStyleList), this); - }; + } nsChangeHint CalcDifference(const nsStyleList& aOther) const; #ifdef DEBUG @@ -642,7 +642,7 @@ struct nsStylePosition : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStylePosition(); aContext->FreeToShell(sizeof(nsStylePosition), this); - }; + } nsChangeHint CalcDifference(const nsStylePosition& aOther) const; #ifdef DEBUG @@ -671,7 +671,7 @@ struct nsStyleTextReset : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleTextReset(); aContext->FreeToShell(sizeof(nsStyleTextReset), this); - }; + } nsChangeHint CalcDifference(const nsStyleTextReset& aOther) const; #ifdef DEBUG @@ -695,7 +695,7 @@ struct nsStyleText : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleText(); aContext->FreeToShell(sizeof(nsStyleText), this); - }; + } nsChangeHint CalcDifference(const nsStyleText& aOther) const; #ifdef DEBUG @@ -725,7 +725,7 @@ struct nsStyleText : public nsStyleStruct { struct nsStyleVisibility : public nsStyleStruct { nsStyleVisibility(nsPresContext* aPresContext); nsStyleVisibility(const nsStyleVisibility& aVisibility); - ~nsStyleVisibility() {}; + ~nsStyleVisibility() {} void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->AllocateFromShell(sz); @@ -733,7 +733,7 @@ struct nsStyleVisibility : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleVisibility(); aContext->FreeToShell(sizeof(nsStyleVisibility), this); - }; + } nsChangeHint CalcDifference(const nsStyleVisibility& aOther) const; #ifdef DEBUG @@ -757,7 +757,7 @@ struct nsStyleVisibility : public nsStyleStruct { struct nsStyleDisplay : public nsStyleStruct { nsStyleDisplay(); nsStyleDisplay(const nsStyleDisplay& aOther); - ~nsStyleDisplay() {}; + ~nsStyleDisplay() {} void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->AllocateFromShell(sz); @@ -765,7 +765,7 @@ struct nsStyleDisplay : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleDisplay(); aContext->FreeToShell(sizeof(nsStyleDisplay), this); - }; + } nsChangeHint CalcDifference(const nsStyleDisplay& aOther) const; #ifdef DEBUG @@ -864,7 +864,7 @@ struct nsStyleTable: public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleTable(); aContext->FreeToShell(sizeof(nsStyleTable), this); - }; + } nsChangeHint CalcDifference(const nsStyleTable& aOther) const; #ifdef DEBUG @@ -889,7 +889,7 @@ struct nsStyleTableBorder: public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleTableBorder(); aContext->FreeToShell(sizeof(nsStyleTableBorder), this); - }; + } nsChangeHint CalcDifference(const nsStyleTableBorder& aOther) const; #ifdef DEBUG @@ -955,7 +955,7 @@ struct nsStyleQuotes : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleQuotes(); aContext->FreeToShell(sizeof(nsStyleQuotes), this); - }; + } nsChangeHint CalcDifference(const nsStyleQuotes& aOther) const; #ifdef DEBUG @@ -1025,7 +1025,7 @@ struct nsStyleContent: public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleContent(); aContext->FreeToShell(sizeof(nsStyleContent), this); - }; + } nsChangeHint CalcDifference(const nsStyleContent& aOther) const; #ifdef DEBUG @@ -1130,7 +1130,7 @@ struct nsStyleUIReset: public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleUIReset(); aContext->FreeToShell(sizeof(nsStyleUIReset), this); - }; + } nsChangeHint CalcDifference(const nsStyleUIReset& aOther) const; #ifdef DEBUG @@ -1160,7 +1160,7 @@ struct nsStyleUserInterface: public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleUserInterface(); aContext->FreeToShell(sizeof(nsStyleUserInterface), this); - }; + } nsChangeHint CalcDifference(const nsStyleUserInterface& aOther) const; #ifdef DEBUG @@ -1195,7 +1195,7 @@ struct nsStyleXUL : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleXUL(); aContext->FreeToShell(sizeof(nsStyleXUL), this); - }; + } nsChangeHint CalcDifference(const nsStyleXUL& aOther) const; #ifdef DEBUG @@ -1221,7 +1221,7 @@ struct nsStyleColumn : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleColumn(); aContext->FreeToShell(sizeof(nsStyleColumn), this); - }; + } nsChangeHint CalcDifference(const nsStyleColumn& aOther) const; #ifdef DEBUG @@ -1271,7 +1271,7 @@ struct nsStyleSVG : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleSVG(); aContext->FreeToShell(sizeof(nsStyleSVG), this); - }; + } nsChangeHint CalcDifference(const nsStyleSVG& aOther) const; #ifdef DEBUG @@ -1316,7 +1316,7 @@ struct nsStyleSVGReset : public nsStyleStruct { void Destroy(nsPresContext* aContext) { this->~nsStyleSVGReset(); aContext->FreeToShell(sizeof(nsStyleSVGReset), this); - }; + } nsChangeHint CalcDifference(const nsStyleSVGReset& aOther) const; #ifdef DEBUG diff --git a/mozilla/layout/tables/SpanningCellSorter.h b/mozilla/layout/tables/SpanningCellSorter.h index 583f69fd7de..cecffb8d9b0 100644 --- a/mozilla/layout/tables/SpanningCellSorter.h +++ b/mozilla/layout/tables/SpanningCellSorter.h @@ -120,6 +120,6 @@ private: * memory, which much be pushed and popped at points matching a * push/pop on the C++ stack. */ - void* operator new(size_t sz) CPP_THROW_NEW { return nsnull; }; + void* operator new(size_t sz) CPP_THROW_NEW { return nsnull; } }; diff --git a/mozilla/layout/tables/nsITableLayoutStrategy.h b/mozilla/layout/tables/nsITableLayoutStrategy.h index 4de4290adb3..10170f27526 100644 --- a/mozilla/layout/tables/nsITableLayoutStrategy.h +++ b/mozilla/layout/tables/nsITableLayoutStrategy.h @@ -53,7 +53,7 @@ struct nsHTMLReflowState; class nsITableLayoutStrategy { public: - virtual ~nsITableLayoutStrategy() {}; + virtual ~nsITableLayoutStrategy() {} /** Implement nsIFrame::GetMinWidth for the table */ virtual nscoord GetMinWidth(nsIRenderingContext* aRenderingContext) = 0; diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.h b/mozilla/layout/tables/nsTableRowGroupFrame.h index 6a0a0614dd5..6d539fb681f 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.h +++ b/mozilla/layout/tables/nsTableRowGroupFrame.h @@ -374,10 +374,10 @@ private: BCPixelSize mLeftContBorderWidth; public: - virtual nsIFrame* GetFirstFrame() { return mFrames.FirstChild(); }; - virtual nsIFrame* GetLastFrame() { return mFrames.LastChild(); }; + virtual nsIFrame* GetFirstFrame() { return mFrames.FirstChild(); } + virtual nsIFrame* GetLastFrame() { return mFrames.LastChild(); } virtual void GetNextFrame(nsIFrame* aFrame, - nsIFrame** aResult) { *aResult = aFrame->GetNextSibling(); }; + nsIFrame** aResult) { *aResult = aFrame->GetNextSibling(); } PRBool IsRepeatable() const; void SetRepeatable(PRBool aRepeatable); PRBool HasStyleHeight() const; diff --git a/mozilla/layout/xul/base/src/nsBoxLayout.h b/mozilla/layout/xul/base/src/nsBoxLayout.h index e2c171e0e65..750092fc922 100644 --- a/mozilla/layout/xul/base/src/nsBoxLayout.h +++ b/mozilla/layout/xul/base/src/nsBoxLayout.h @@ -45,7 +45,7 @@ class nsBoxLayout : public nsIBoxLayout { public: nsBoxLayout(); - virtual ~nsBoxLayout() {}; + virtual ~nsBoxLayout() {} NS_DECL_ISUPPORTS diff --git a/mozilla/layout/xul/base/src/nsMenuBarFrame.h b/mozilla/layout/xul/base/src/nsMenuBarFrame.h index 8df9673a69c..f31c234973b 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarFrame.h +++ b/mozilla/layout/xul/base/src/nsMenuBarFrame.h @@ -73,24 +73,24 @@ public: virtual nsIMenuFrame* GetNextMenuItem(nsIMenuFrame* aStart); virtual nsIMenuFrame* GetPreviousMenuItem(nsIMenuFrame* aStart); NS_IMETHOD SetActive(PRBool aActiveFlag); - NS_IMETHOD GetIsActive(PRBool& isActive) { isActive = IsActive(); return NS_OK; }; - NS_IMETHOD IsMenuBar(PRBool& isMenuBar) { isMenuBar = PR_TRUE; return NS_OK; }; + NS_IMETHOD GetIsActive(PRBool& isActive) { isActive = IsActive(); return NS_OK; } + NS_IMETHOD IsMenuBar(PRBool& isMenuBar) { isMenuBar = PR_TRUE; return NS_OK; } NS_IMETHOD ConsumeOutsideClicks(PRBool& aConsumeOutsideClicks) \ - {aConsumeOutsideClicks = PR_FALSE; return NS_OK;}; + {aConsumeOutsideClicks = PR_FALSE; return NS_OK;} NS_IMETHOD ClearRecentlyRolledUp(); NS_IMETHOD RecentlyRolledUp(nsIMenuFrame *aMenuFrame, PRBool *aJustRolledUp); - NS_IMETHOD SetIsContextMenu(PRBool aIsContextMenu) { return NS_OK; }; - NS_IMETHOD GetIsContextMenu(PRBool& aIsContextMenu) { aIsContextMenu = PR_FALSE; return NS_OK; }; + NS_IMETHOD SetIsContextMenu(PRBool aIsContextMenu) { return NS_OK; } + NS_IMETHOD GetIsContextMenu(PRBool& aIsContextMenu) { aIsContextMenu = PR_FALSE; return NS_OK; } NS_IMETHOD GetParentPopup(nsIMenuParent** aResult) { *aResult = nsnull; - return NS_OK;}; + return NS_OK;} - NS_IMETHOD IsActive() { return mIsActive; }; + NS_IMETHOD IsActive() { return mIsActive; } NS_IMETHOD IsOpen(); NS_IMETHOD KillPendingTimers(); - NS_IMETHOD CancelPendingTimers() { return NS_OK; }; + NS_IMETHOD CancelPendingTimers() { return NS_OK; } // Closes up the chain of open cascaded menus. NS_IMETHOD DismissChain(); diff --git a/mozilla/layout/xul/base/src/nsMenuDismissalListener.h b/mozilla/layout/xul/base/src/nsMenuDismissalListener.h index 0cb965800df..1c2313fc7a5 100644 --- a/mozilla/layout/xul/base/src/nsMenuDismissalListener.h +++ b/mozilla/layout/xul/base/src/nsMenuDismissalListener.h @@ -62,13 +62,13 @@ class nsMenuDismissalListener : public nsIDOMMouseListener, public: friend class nsMenuPopupFrame; - NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }; - NS_IMETHOD MouseDown(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseUp(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; }; + NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; } + NS_IMETHOD MouseDown(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseUp(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; } NS_DECL_ISUPPORTS NS_DECL_NSIROLLUPLISTENER diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.h b/mozilla/layout/xul/base/src/nsMenuFrame.h index bf71e1358f1..0bee50a141f 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.h +++ b/mozilla/layout/xul/base/src/nsMenuFrame.h @@ -120,7 +120,7 @@ public: NS_IMETHOD SetDebug(nsBoxLayoutState& aState, PRBool aDebug); #endif - NS_IMETHOD IsActive(PRBool& aResult) { aResult = PR_TRUE; return NS_OK; }; + NS_IMETHOD IsActive(PRBool& aResult) { aResult = PR_TRUE; return NS_OK; } // The following four methods are all overridden so that the menu children // can be stored in a separate list (so that they don't impact reflow of the @@ -175,10 +175,10 @@ public: NS_IMETHOD SetParent(const nsIFrame* aParent); - virtual nsIMenuParent *GetMenuParent() { return mMenuParent; }; + virtual nsIMenuParent *GetMenuParent() { return mMenuParent; } virtual nsIFrame *GetMenuChild() { return mPopupFrames.FirstChild(); } - NS_IMETHOD GetRadioGroupName(nsString &aName) { aName = mGroupName; return NS_OK; }; - NS_IMETHOD GetMenuType(nsMenuType &aType) { aType = mType; return NS_OK; }; + NS_IMETHOD GetRadioGroupName(nsString &aName) { aName = mGroupName; return NS_OK; } + NS_IMETHOD GetMenuType(nsMenuType &aType) { aType = mType; return NS_OK; } NS_IMETHOD MarkAsGenerated(); // nsIScrollableViewProvider methods @@ -189,13 +189,13 @@ public: nsresult DestroyPopupFrames(nsPresContext* aPresContext); - PRBool IsOpen() { return mMenuOpen; }; + PRBool IsOpen() { return mMenuOpen; } PRBool IsMenu(); PRBool IsDisabled(); PRBool IsGenerated(); NS_IMETHOD ToggleMenuState(); // @see comment *** - void SetIsMenu(PRBool aIsMenu) { mIsMenu = aIsMenu; }; + void SetIsMenu(PRBool aIsMenu) { mIsMenu = aIsMenu; } #ifdef DEBUG NS_IMETHOD GetFrameName(nsAString& aResult) const diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.h b/mozilla/layout/xul/base/src/nsMenuPopupFrame.h index 860d5390698..896833f3532 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.h +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.h @@ -111,14 +111,14 @@ public: NS_IMETHOD SetCurrentMenuItem(nsIMenuFrame* aMenuItem); virtual nsIMenuFrame* GetNextMenuItem(nsIMenuFrame* aStart); virtual nsIMenuFrame* GetPreviousMenuItem(nsIMenuFrame* aStart); - NS_IMETHOD SetActive(PRBool aActiveFlag) { return NS_OK; }; // We don't care. - NS_IMETHOD GetIsActive(PRBool& isActive) { isActive = PR_FALSE; return NS_OK; }; - NS_IMETHOD IsMenuBar(PRBool& isMenuBar) { isMenuBar = PR_FALSE; return NS_OK; }; + NS_IMETHOD SetActive(PRBool aActiveFlag) { return NS_OK; } // We don't care. + NS_IMETHOD GetIsActive(PRBool& isActive) { isActive = PR_FALSE; return NS_OK; } + NS_IMETHOD IsMenuBar(PRBool& isMenuBar) { isMenuBar = PR_FALSE; return NS_OK; } NS_IMETHOD ConsumeOutsideClicks(PRBool& aConsumeOutsideClicks); NS_IMETHOD ClearRecentlyRolledUp() {return NS_OK;} NS_IMETHOD RecentlyRolledUp(nsIMenuFrame *aMenuFrame, PRBool *aJustRolledUp) {*aJustRolledUp = PR_FALSE; return NS_OK;} - NS_IMETHOD SetIsContextMenu(PRBool aIsContextMenu) { mIsContextMenu = aIsContextMenu; return NS_OK; }; - NS_IMETHOD GetIsContextMenu(PRBool& aIsContextMenu) { aIsContextMenu = mIsContextMenu; return NS_OK; }; + NS_IMETHOD SetIsContextMenu(PRBool aIsContextMenu) { mIsContextMenu = aIsContextMenu; return NS_OK; } + NS_IMETHOD GetIsContextMenu(PRBool& aIsContextMenu) { aIsContextMenu = mIsContextMenu; return NS_OK; } NS_IMETHOD GetParentPopup(nsIMenuParent** aResult); diff --git a/mozilla/layout/xul/base/src/nsXULTooltipListener.h b/mozilla/layout/xul/base/src/nsXULTooltipListener.h index 3bbe0b4b2df..6a48b23331f 100644 --- a/mozilla/layout/xul/base/src/nsXULTooltipListener.h +++ b/mozilla/layout/xul/base/src/nsXULTooltipListener.h @@ -66,29 +66,29 @@ public: // nsIDOMMouseListener NS_IMETHOD MouseDown(nsIDOMEvent* aMouseEvent); NS_IMETHOD MouseUp(nsIDOMEvent* aMouseEvent); - NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; }; - NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; }; + NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; } + NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; } NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent); // nsIDOMMouseMotionListener - NS_IMETHOD DragMove(nsIDOMEvent* aMouseEvent) { return NS_OK; }; + NS_IMETHOD DragMove(nsIDOMEvent* aMouseEvent) { return NS_OK; } NS_IMETHOD MouseMove(nsIDOMEvent* aMouseEvent); // nsIDOMKeyListener NS_IMETHOD KeyDown(nsIDOMEvent* aKeyEvent); - NS_IMETHOD KeyUp(nsIDOMEvent* aKeyEvent) { return NS_OK; }; - NS_IMETHOD KeyPress(nsIDOMEvent* aKeyEvent) { return NS_OK; }; + NS_IMETHOD KeyUp(nsIDOMEvent* aKeyEvent) { return NS_OK; } + NS_IMETHOD KeyPress(nsIDOMEvent* aKeyEvent) { return NS_OK; } // nsIDOMXULListener - NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent) { return NS_OK; }; - NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) { return NS_OK; }; + NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent) { return NS_OK; } + NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) { return NS_OK; } NS_IMETHOD PopupHiding(nsIDOMEvent* aEvent); - NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; }; - NS_IMETHOD Close(nsIDOMEvent* aEvent) { return NS_OK; }; - NS_IMETHOD Command(nsIDOMEvent* aEvent) { return NS_OK; }; - NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }; - NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }; + NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; } + NS_IMETHOD Close(nsIDOMEvent* aEvent) { return NS_OK; } + NS_IMETHOD Command(nsIDOMEvent* aEvent) { return NS_OK; } + NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; } + NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; } // nsIDOMEventListener NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent); diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h index 6b4cb30de80..2f8d148fdce 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h @@ -99,7 +99,7 @@ public: // nsIScrollbarMediator NS_IMETHOD PositionChanged(nsISupports* aScrollbar, PRInt32 aOldIndex, PRInt32& aNewIndex); NS_IMETHOD ScrollbarButtonPressed(nsISupports* aScrollbar, PRInt32 aOldIndex, PRInt32 aNewIndex); - NS_IMETHOD VisibilityChanged(nsISupports* aScrollbar, PRBool aVisible) { Invalidate(); return NS_OK; }; + NS_IMETHOD VisibilityChanged(nsISupports* aScrollbar, PRBool aVisible) { Invalidate(); return NS_OK; } // Overridden from nsIFrame to cache our pres context. NS_IMETHOD Init(nsIContent* aContent, @@ -226,7 +226,7 @@ protected: PRInt32 GetLastVisibleRow() { return mTopRowIndex + mPageLength; - }; + } // An internal hit test. aX and aY are expected to be in twips in the // coordinate system of this frame. @@ -359,7 +359,7 @@ protected: InvalidateRow(aRow); if (aOrientation != nsITreeView::DROP_ON) InvalidateRow(aRow + aOrientation); - }; + } already_AddRefed GetColumnImpl(nsITreeColumn* aUnknownCol) { if (!aUnknownCol) @@ -450,12 +450,12 @@ protected: // Data Members public: Slots() : mValueArray(~PRInt32(0)) { - }; + } ~Slots() { if (mTimer) mTimer->Cancel(); - }; + } friend class nsTreeBodyFrame; diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeColumns.h b/mozilla/layout/xul/base/src/tree/src/nsTreeColumns.h index cb106fb642b..a7e649be552 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeColumns.h +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeColumns.h @@ -74,28 +74,28 @@ protected: nsresult GetXInTwips(nsIFrame* aBodyFrame, nscoord* aResult); nsresult GetWidthInTwips(nsIFrame* aBodyFrame, nscoord* aResult); - void SetColumns(nsTreeColumns* aColumns) { mColumns = aColumns; }; + void SetColumns(nsTreeColumns* aColumns) { mColumns = aColumns; } - const nsAString& GetId() { return mId; }; - nsIAtom* GetAtom() { return mAtom; }; + const nsAString& GetId() { return mId; } + nsIAtom* GetAtom() { return mAtom; } - PRInt32 GetIndex() { return mIndex; }; + PRInt32 GetIndex() { return mIndex; } - PRBool IsPrimary() { return mIsPrimary; }; - PRBool IsCycler() { return mIsCycler; }; - PRBool IsEditable() { return mIsEditable; }; - PRBool IsSelectable() { return mIsSelectable; }; - PRBool Overflow() { return mOverflow; }; + PRBool IsPrimary() { return mIsPrimary; } + PRBool IsCycler() { return mIsCycler; } + PRBool IsEditable() { return mIsEditable; } + PRBool IsSelectable() { return mIsSelectable; } + PRBool Overflow() { return mOverflow; } - PRInt16 GetType() { return mType; }; + PRInt16 GetType() { return mType; } - PRInt8 GetCropStyle() { return mCropStyle; }; - PRInt32 GetTextAlignment() { return mTextAlignment; }; + PRInt8 GetCropStyle() { return mCropStyle; } + PRInt32 GetTextAlignment() { return mTextAlignment; } - nsTreeColumn* GetNext() { return mNext; }; - nsTreeColumn* GetPrevious() { return mPrevious; }; - void SetNext(nsTreeColumn* aNext) { NS_IF_ADDREF(mNext = aNext); }; - void SetPrevious(nsTreeColumn* aPrevious) { mPrevious = aPrevious; }; + nsTreeColumn* GetNext() { return mNext; } + nsTreeColumn* GetPrevious() { return mPrevious; } + void SetNext(nsTreeColumn* aNext) { NS_IF_ADDREF(mNext = aNext); } + void SetPrevious(nsTreeColumn* aPrevious) { mPrevious = aPrevious; } private: /** @@ -143,12 +143,12 @@ public: friend class nsTreeBodyFrame; protected: - void SetTree(nsITreeBoxObject* aTree) { mTree = aTree; }; + void SetTree(nsITreeBoxObject* aTree) { mTree = aTree; } // Builds our cache of column info. void EnsureColumns(); - nsTreeColumn* GetFirstColumn() { EnsureColumns(); return mFirstColumn; }; + nsTreeColumn* GetFirstColumn() { EnsureColumns(); return mFirstColumn; } nsTreeColumn* GetPrimaryColumn(); private: diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeImageListener.h b/mozilla/layout/xul/base/src/tree/src/nsTreeImageListener.h index 976b0cccebc..3461c8fa4cd 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeImageListener.h +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeImageListener.h @@ -83,7 +83,7 @@ public: friend class nsTreeBodyFrame; protected: - void UnsuppressInvalidation() { mInvalidationSuppressed = PR_FALSE; }; + void UnsuppressInvalidation() { mInvalidationSuppressed = PR_FALSE; } void Invalidate(); private: @@ -95,17 +95,17 @@ private: class InvalidationArea { public: InvalidationArea(nsITreeColumn* aCol); - ~InvalidationArea() { delete mNext; }; + ~InvalidationArea() { delete mNext; } friend class nsTreeImageListener; protected: void AddRow(PRInt32 aIndex); - nsITreeColumn* GetCol() { return mCol.get(); }; - PRInt32 GetMin() { return mMin; }; - PRInt32 GetMax() { return mMax; }; - InvalidationArea* GetNext() { return mNext; }; - void SetNext(InvalidationArea* aNext) { mNext = aNext; }; + nsITreeColumn* GetCol() { return mCol.get(); } + PRInt32 GetMin() { return mMin; } + PRInt32 GetMax() { return mMax; } + InvalidationArea* GetNext() { return mNext; } + void SetNext(InvalidationArea* aNext) { mNext = aNext; } private: nsCOMPtr mCol; diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp index d80e0b8133f..1712b769e0c 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp @@ -69,11 +69,11 @@ struct nsTreeRange PRInt32 mMax; nsTreeRange(nsTreeSelection* aSel, PRInt32 aSingleVal) - :mSelection(aSel), mPrev(nsnull), mNext(nsnull), mMin(aSingleVal), mMax(aSingleVal) {}; + :mSelection(aSel), mPrev(nsnull), mNext(nsnull), mMin(aSingleVal), mMax(aSingleVal) {} nsTreeRange(nsTreeSelection* aSel, PRInt32 aMin, PRInt32 aMax) - :mSelection(aSel), mPrev(nsnull), mNext(nsnull), mMin(aMin), mMax(aMax) {}; + :mSelection(aSel), mPrev(nsnull), mNext(nsnull), mMin(aMin), mMax(aMax) {} - ~nsTreeRange() { delete mNext; }; + ~nsTreeRange() { delete mNext; } void Connect(nsTreeRange* aPrev = nsnull, nsTreeRange* aNext = nsnull) { if (aPrev) @@ -86,7 +86,7 @@ struct nsTreeRange mPrev = aPrev; mNext = aNext; - }; + } nsresult RemoveRange(PRInt32 aStart, PRInt32 aEnd) { // This should so be a loop... sigh... @@ -126,7 +126,7 @@ struct nsTreeRange mMax = aStart - 1; } return next ? next->RemoveRange(aStart, aEnd) : NS_OK; - }; + } nsresult Remove(PRInt32 aIndex) { if (aIndex >= mMin && aIndex <= mMax) { @@ -161,7 +161,7 @@ struct nsTreeRange return mNext->Remove(aIndex); return NS_OK; - }; + } nsresult Add(PRInt32 aIndex) { if (aIndex < mMin) { @@ -195,7 +195,7 @@ struct nsTreeRange } } return NS_OK; - }; + } PRBool Contains(PRInt32 aIndex) { if (aIndex >= mMin && aIndex <= mMax) @@ -205,21 +205,21 @@ struct nsTreeRange return mNext->Contains(aIndex); return PR_FALSE; - }; + } PRInt32 Count() { PRInt32 total = mMax - mMin + 1; if (mNext) total += mNext->Count(); return total; - }; + } void Invalidate() { if (mSelection->mTree) mSelection->mTree->InvalidateRange(mMin, mMax); if (mNext) mNext->Invalidate(); - }; + } void RemoveAllBut(PRInt32 aIndex) { if (aIndex >= mMin && aIndex <= mMax) { @@ -244,7 +244,7 @@ struct nsTreeRange } else if (mNext) mNext->RemoveAllBut(aIndex); - }; + } void Insert(nsTreeRange* aRange) { if (mMin >= aRange->mMax) @@ -253,7 +253,7 @@ struct nsTreeRange mNext->Insert(aRange); else aRange->Connect(this, nsnull); - }; + } }; nsTreeSelection::nsTreeSelection(nsITreeBoxObject* aTree) diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeStyleCache.h b/mozilla/layout/xul/base/src/tree/src/nsTreeStyleCache.h index 41e49c68ae1..7a5430a40e2 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeStyleCache.h +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeStyleCache.h @@ -50,9 +50,9 @@ class nsDFAState : public nsHashKey public: PRUint32 mStateID; - nsDFAState(PRUint32 aID) :mStateID(aID) {}; + nsDFAState(PRUint32 aID) :mStateID(aID) {} - PRUint32 GetStateID() { return mStateID; }; + PRUint32 GetStateID() { return mStateID; } PRUint32 HashCode(void) const { return mStateID; @@ -74,7 +74,7 @@ public: PRUint32 mState; nsCOMPtr mInputSymbol; - nsTransitionKey(PRUint32 aState, nsIAtom* aSymbol) :mState(aState), mInputSymbol(aSymbol) {}; + nsTransitionKey(PRUint32 aState, nsIAtom* aSymbol) :mState(aState), mInputSymbol(aSymbol) {} PRUint32 HashCode(void) const { // Make a 32-bit integer that combines the low-order 16 bits of the state and the input symbol. @@ -96,10 +96,10 @@ public: class nsTreeStyleCache { public: - nsTreeStyleCache() :mTransitionTable(nsnull), mCache(nsnull), mNextState(0) {}; - ~nsTreeStyleCache() { Clear(); }; + nsTreeStyleCache() :mTransitionTable(nsnull), mCache(nsnull), mNextState(0) {} + ~nsTreeStyleCache() { Clear(); } - void Clear() { delete mTransitionTable; mTransitionTable = nsnull; delete mCache; mCache = nsnull; mNextState = 0; }; + void Clear() { delete mTransitionTable; mTransitionTable = nsnull; delete mCache; mCache = nsnull; mNextState = 0; } nsStyleContext* GetStyleContext(nsICSSPseudoComparator* aComparator, nsPresContext* aPresContext, diff --git a/mozilla/modules/libjar/nsJAR.h b/mozilla/modules/libjar/nsJAR.h index 96502412903..f515a34f283 100644 --- a/mozilla/modules/libjar/nsJAR.h +++ b/mozilla/modules/libjar/nsJAR.h @@ -103,7 +103,7 @@ class nsJAR : public nsIZipReader, public nsIJAR nsJAR(); virtual ~nsJAR(); - NS_DEFINE_STATIC_CID_ACCESSOR( NS_ZIPREADER_CID ); + NS_DEFINE_STATIC_CID_ACCESSOR( NS_ZIPREADER_CID ) NS_DECL_ISUPPORTS @@ -178,7 +178,7 @@ public: NS_DECL_NSIZIPENTRY nsJARItem(nsZipItem* aZipItem); - virtual ~nsJARItem() {}; + virtual ~nsJARItem() {} private: PRUint32 mSize; /* size in original file */ diff --git a/mozilla/modules/libjar/nsXPTZipLoader.h b/mozilla/modules/libjar/nsXPTZipLoader.h index 4c968421424..80029cbd7e2 100644 --- a/mozilla/modules/libjar/nsXPTZipLoader.h +++ b/mozilla/modules/libjar/nsXPTZipLoader.h @@ -52,7 +52,7 @@ class nsXPTZipLoader : public nsIXPTLoader { public: nsXPTZipLoader(); - virtual ~nsXPTZipLoader() {}; + virtual ~nsXPTZipLoader() {} NS_DECL_ISUPPORTS NS_DECL_NSIXPTLOADER diff --git a/mozilla/modules/libpref/src/nsPrefBranch.h b/mozilla/modules/libpref/src/nsPrefBranch.h index d2229d2ed97..365180443de 100644 --- a/mozilla/modules/libpref/src/nsPrefBranch.h +++ b/mozilla/modules/libpref/src/nsPrefBranch.h @@ -72,7 +72,7 @@ public: protected: nsPrefBranch() /* disallow use of this constructer */ - { }; + { } nsresult GetDefaultFromPropertiesFile(const char *aPrefName, PRUnichar **return_buf); const char *getPrefName(const char *aPrefName); diff --git a/mozilla/modules/oji/src/nsCNullSecurityContext.h b/mozilla/modules/oji/src/nsCNullSecurityContext.h index 0c74f667915..31eaf470cf9 100644 --- a/mozilla/modules/oji/src/nsCNullSecurityContext.h +++ b/mozilla/modules/oji/src/nsCNullSecurityContext.h @@ -89,7 +89,7 @@ public: ////////////////////////////////////////////////////////////////////// // from nsISecureJNI: - nsCNullSecurityContext() { }; + nsCNullSecurityContext() { } }; #endif // CSecurityContext_h___ diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp index 2c640ae9fd3..4f98e59a42d 100644 --- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp @@ -1062,7 +1062,7 @@ public: ~ns4xStreamWrapper(); void GetStream(nsIOutputStream* &result); - NPStream* GetNPStream(void) { return &fNPStream; }; + NPStream* GetNPStream(void) { return &fNPStream; } }; NS_IMPL_ISUPPORTS1(ns4xStreamWrapper, nsISupports) diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.h b/mozilla/modules/plugin/base/src/ns4xPluginInstance.h index 8083234f01a..a915281b5d3 100644 --- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.h +++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.h @@ -145,7 +145,7 @@ public: PRBool IsStarted(void); // cache this 4.x plugin like an XPCOM plugin - nsresult SetCached(PRBool aCache) { mCached = aCache; return NS_OK; }; + nsresult SetCached(PRBool aCache) { mCached = aCache; return NS_OK; } // Non-refcounting accessor for faster access to the peer. nsIPluginInstancePeer *Peer() diff --git a/mozilla/netwerk/base/src/nsUnicharStreamLoader.h b/mozilla/netwerk/base/src/nsUnicharStreamLoader.h index ca32fd1d1fc..b98cf629795 100644 --- a/mozilla/netwerk/base/src/nsUnicharStreamLoader.h +++ b/mozilla/netwerk/base/src/nsUnicharStreamLoader.h @@ -55,7 +55,7 @@ public: NS_DECL_NSISTREAMLISTENER nsUnicharStreamLoader() { } - virtual ~nsUnicharStreamLoader() {}; + virtual ~nsUnicharStreamLoader() {} static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult); diff --git a/mozilla/netwerk/cookie/src/nsCookie.h b/mozilla/netwerk/cookie/src/nsCookie.h index 80858d76a2b..96f47e5feaa 100644 --- a/mozilla/netwerk/cookie/src/nsCookie.h +++ b/mozilla/netwerk/cookie/src/nsCookie.h @@ -116,7 +116,7 @@ class nsCookie : public nsICookie2 nsCookieStatus aStatus, nsCookiePolicy aPolicy); - virtual ~nsCookie() {}; + virtual ~nsCookie() {} // fast (inline, non-xpcom) getters inline const nsDependentCString Name() const { return nsDependentCString(mName, mValue - 1); } diff --git a/mozilla/netwerk/mime/src/nsMIMEHeaderParamImpl.h b/mozilla/netwerk/mime/src/nsMIMEHeaderParamImpl.h index 59a77abe835..9267155d3ae 100644 --- a/mozilla/netwerk/mime/src/nsMIMEHeaderParamImpl.h +++ b/mozilla/netwerk/mime/src/nsMIMEHeaderParamImpl.h @@ -45,8 +45,8 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIMIMEHEADERPARAM - nsMIMEHeaderParamImpl() {}; - virtual ~nsMIMEHeaderParamImpl() {}; + nsMIMEHeaderParamImpl() {} + virtual ~nsMIMEHeaderParamImpl() {} }; #endif diff --git a/mozilla/parser/htmlparser/src/nsParserService.cpp b/mozilla/parser/htmlparser/src/nsParserService.cpp index 6ef4be23bbd..1eddf18d3d9 100644 --- a/mozilla/parser/htmlparser/src/nsParserService.cpp +++ b/mozilla/parser/htmlparser/src/nsParserService.cpp @@ -226,12 +226,12 @@ class nsMatchesTopic : public nsDequeFunctor{ public: PRBool matched; nsObserverEntry* entry; - nsMatchesTopic(const nsAString& aString):mString(aString),matched(PR_FALSE){}; + nsMatchesTopic(const nsAString& aString):mString(aString),matched(PR_FALSE){} virtual void* operator()(void* anObject){ entry=NS_STATIC_CAST(nsObserverEntry*, anObject); matched=mString.Equals(entry->mTopic); return matched ? nsnull : anObject; - }; + } }; // XXX This may be more efficient as a HashTable instead of linear search diff --git a/mozilla/rdf/base/src/nsInMemoryDataSource.cpp b/mozilla/rdf/base/src/nsInMemoryDataSource.cpp index 599355ef233..5a489e10286 100644 --- a/mozilla/rdf/base/src/nsInMemoryDataSource.cpp +++ b/mozilla/rdf/base/src/nsInMemoryDataSource.cpp @@ -2135,7 +2135,7 @@ public: VisitorClosure(rdfITripleVisitor* aVisitor) : mVisitor(aVisitor), mRv(NS_OK) - {}; + {} rdfITripleVisitor* mVisitor; nsresult mRv; }; @@ -2177,7 +2177,7 @@ class TriplesInnerClosure { public: TriplesInnerClosure(nsIRDFNode* aSubject, VisitorClosure* aClosure) : - mSubject(aSubject), mOuter(aClosure) {}; + mSubject(aSubject), mOuter(aClosure) {} nsIRDFNode* mSubject; VisitorClosure* mOuter; }; diff --git a/mozilla/rdf/base/src/rdfTriplesSerializer.cpp b/mozilla/rdf/base/src/rdfTriplesSerializer.cpp index d1ea11f40e0..02676981c00 100644 --- a/mozilla/rdf/base/src/rdfTriplesSerializer.cpp +++ b/mozilla/rdf/base/src/rdfTriplesSerializer.cpp @@ -56,7 +56,7 @@ class TriplesVisitor : public rdfITripleVisitor { public: - TriplesVisitor(nsIOutputStream* aOut) : mOut(aOut) {}; + TriplesVisitor(nsIOutputStream* aOut) : mOut(aOut) {} NS_DECL_RDFITRIPLEVISITOR NS_DECL_ISUPPORTS protected: diff --git a/mozilla/security/manager/ssl/src/nsCMS.h b/mozilla/security/manager/ssl/src/nsCMS.h index 6a3745e75d3..6cf165d1d25 100644 --- a/mozilla/security/manager/ssl/src/nsCMS.h +++ b/mozilla/security/manager/ssl/src/nsCMS.h @@ -71,7 +71,7 @@ public: virtual ~nsCMSMessage(); void referenceContext(nsIInterfaceRequestor* aContext) {m_ctx = aContext;} - NSSCMSMessage* getCMS() {return m_cmsMsg;}; + NSSCMSMessage* getCMS() {return m_cmsMsg;} private: nsCOMPtr m_ctx; NSSCMSMessage * m_cmsMsg; diff --git a/mozilla/security/manager/ssl/src/nsKeyModule.h b/mozilla/security/manager/ssl/src/nsKeyModule.h index 64608af8b53..0a6db1d3174 100644 --- a/mozilla/security/manager/ssl/src/nsKeyModule.h +++ b/mozilla/security/manager/ssl/src/nsKeyModule.h @@ -89,7 +89,7 @@ public: NS_DECL_NSIKEYOBJECTFACTORY private: - ~nsKeyObjectFactory() {}; + ~nsKeyObjectFactory() {} // Disallow copy constructor nsKeyObjectFactory(nsKeyObjectFactory&); diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.h b/mozilla/security/manager/ssl/src/nsNSSComponent.h index 96d24728d28..ea255ccc267 100644 --- a/mozilla/security/manager/ssl/src/nsNSSComponent.h +++ b/mozilla/security/manager/ssl/src/nsNSSComponent.h @@ -192,7 +192,7 @@ class nsNSSComponent : public nsISignatureVerifier, public nsINSSErrorsService { public: - NS_DEFINE_STATIC_CID_ACCESSOR( NS_NSSCOMPONENT_CID ); + NS_DEFINE_STATIC_CID_ACCESSOR( NS_NSSCOMPONENT_CID ) nsNSSComponent(); virtual ~nsNSSComponent(); diff --git a/mozilla/toolkit/components/downloads/src/nsDownloadManager.h b/mozilla/toolkit/components/downloads/src/nsDownloadManager.h index af98e1f1898..08257526ec8 100644 --- a/mozilla/toolkit/components/downloads/src/nsDownloadManager.h +++ b/mozilla/toolkit/components/downloads/src/nsDownloadManager.h @@ -122,7 +122,7 @@ protected: return aState == nsIDownloadManager::DOWNLOAD_NOTSTARTED || aState == nsIDownloadManager::DOWNLOAD_DOWNLOADING || aState == nsIXPInstallManagerUI::INSTALL_INSTALLING; - }; + } static PRBool IsInProgress(DownloadState aState) { @@ -131,13 +131,13 @@ protected: aState == nsIDownloadManager::DOWNLOAD_PAUSED || aState == nsIXPInstallManagerUI::INSTALL_DOWNLOADING || aState == nsIXPInstallManagerUI::INSTALL_INSTALLING; - }; + } static PRBool CompletedSuccessfully(DownloadState aState) { return aState == nsIDownloadManager::DOWNLOAD_FINISHED || aState == nsIXPInstallManagerUI::INSTALL_FINISHED; - }; + } private: nsCOMPtr mListener; @@ -159,7 +159,7 @@ public: NS_DECL_NSIXPIPROGRESSDIALOG NS_DECL_ISUPPORTS - nsXPIProgressListener() { }; + nsXPIProgressListener() { } nsXPIProgressListener(nsDownloadManager* aManager); virtual ~nsXPIProgressListener(); @@ -187,8 +187,8 @@ public: NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDownloadsDataSource, nsIRDFDataSource) - nsDownloadsDataSource() { }; - virtual ~nsDownloadsDataSource() { }; + nsDownloadsDataSource() { } + virtual ~nsDownloadsDataSource() { } nsresult LoadDataSource(); diff --git a/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp b/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp index eb01d2e7f3c..5bded3283e8 100644 --- a/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp +++ b/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp @@ -73,7 +73,7 @@ public: NS_DECL_NSISTREAMLISTENER private: - ~TableUpdateListener() {}; + ~TableUpdateListener() {} // Callback when table updates complete. nsCOMPtr mTableCallback; diff --git a/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.h b/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.h index 3a8e5b866c3..1e453854974 100644 --- a/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.h +++ b/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.h @@ -66,7 +66,7 @@ public: private: // No subclassing - ~nsUrlClassifierStreamUpdater() {}; + ~nsUrlClassifierStreamUpdater() {} // Disallow copy constructor nsUrlClassifierStreamUpdater(nsUrlClassifierStreamUpdater&); diff --git a/mozilla/tools/leaky/config.h b/mozilla/tools/leaky/config.h index c5245f39920..48c2d0c2665 100644 --- a/mozilla/tools/leaky/config.h +++ b/mozilla/tools/leaky/config.h @@ -53,7 +53,7 @@ extern "C" { void* __libc_malloc(size_t); void* __libc_realloc(void*, size_t); void __libc_free(void*); -}; +} #endif /* linux */ diff --git a/mozilla/tools/leaky/libmalloc.h b/mozilla/tools/leaky/libmalloc.h index 7361243ac1c..d7d3010221e 100644 --- a/mozilla/tools/leaky/libmalloc.h +++ b/mozilla/tools/leaky/libmalloc.h @@ -100,7 +100,7 @@ void __log_addref(void* p, int oldrc, int newrc); void __log_release(void* p, int oldrc, int newrc); #ifdef __cplusplus -}; /* end of extern "C" */ +} /* end of extern "C" */ #endif #endif /* libmalloc_h___ */ diff --git a/mozilla/widget/src/gtk2/nsDeviceContextSpecG.cpp b/mozilla/widget/src/gtk2/nsDeviceContextSpecG.cpp index 19bb0cb67df..7add740d9c7 100644 --- a/mozilla/widget/src/gtk2/nsDeviceContextSpecG.cpp +++ b/mozilla/widget/src/gtk2/nsDeviceContextSpecG.cpp @@ -115,7 +115,7 @@ protected: class nsPrinterFeatures { public: nsPrinterFeatures( const char *printername ); - ~nsPrinterFeatures() {}; + ~nsPrinterFeatures() {} /* Does this printer allow to set/change the paper size ? */ void SetCanChangePaperSize( PRBool aCanSetPaperSize ); diff --git a/mozilla/xpcom/glue/nsGenericFactory.h b/mozilla/xpcom/glue/nsGenericFactory.h index 149f39fc19f..960cee15c9e 100644 --- a/mozilla/xpcom/glue/nsGenericFactory.h +++ b/mozilla/xpcom/glue/nsGenericFactory.h @@ -48,7 +48,7 @@ */ class nsGenericFactory : public nsIGenericFactory, public nsIClassInfo { public: - NS_DEFINE_STATIC_CID_ACCESSOR(NS_GENERICFACTORY_CID); + NS_DEFINE_STATIC_CID_ACCESSOR(NS_GENERICFACTORY_CID) nsGenericFactory(const nsModuleComponentInfo *info = NULL); diff --git a/mozilla/xpcom/io/nsBinaryStream.h b/mozilla/xpcom/io/nsBinaryStream.h index 7be46dc7104..c59e82cb41c 100644 --- a/mozilla/xpcom/io/nsBinaryStream.h +++ b/mozilla/xpcom/io/nsBinaryStream.h @@ -61,9 +61,9 @@ class nsBinaryOutputStream : public nsIObjectOutputStream { public: - nsBinaryOutputStream() {}; + nsBinaryOutputStream() {} // virtual dtor since subclasses call our Release() - virtual ~nsBinaryOutputStream() {}; + virtual ~nsBinaryOutputStream() {} protected: // nsISupports methods @@ -101,9 +101,9 @@ protected: class nsBinaryInputStream : public nsIObjectInputStream { public: - nsBinaryInputStream() {}; + nsBinaryInputStream() {} // virtual dtor since subclasses call our Release() - virtual ~nsBinaryInputStream() {}; + virtual ~nsBinaryInputStream() {} protected: // nsISupports methods diff --git a/mozilla/xpcom/io/nsScriptableInputStream.h b/mozilla/xpcom/io/nsScriptableInputStream.h index b99761768c9..76f3b19978e 100644 --- a/mozilla/xpcom/io/nsScriptableInputStream.h +++ b/mozilla/xpcom/io/nsScriptableInputStream.h @@ -57,13 +57,13 @@ public: NS_DECL_NSISCRIPTABLEINPUTSTREAM // nsScriptableInputStream methods - nsScriptableInputStream() {}; + nsScriptableInputStream() {} static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult); private: - ~nsScriptableInputStream() {}; + ~nsScriptableInputStream() {} nsCOMPtr mInputStream; }; diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.h b/mozilla/xpinstall/src/nsSoftwareUpdate.h index a10d39e42a2..9cef0c49641 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdate.h +++ b/mozilla/xpinstall/src/nsSoftwareUpdate.h @@ -29,7 +29,7 @@ class nsSoftwareUpdate: public nsISoftwareUpdate, { public: - NS_DEFINE_STATIC_CID_ACCESSOR( NS_SoftwareUpdate_CID ); + NS_DEFINE_STATIC_CID_ACCESSOR( NS_SoftwareUpdate_CID ) static nsSoftwareUpdate *GetInstance();