Bug 376636 - Building with gcc 4.3 and -pendatic fails due to extra semicolons, patch by Art Haas <ahaas@airmail.net>, rs=me

This commit is contained in:
benjamin@smedbergs.us 2007-04-23 07:21:53 -07:00
Родитель cc4ca83433
Коммит baab01ada6
155 изменённых файлов: 442 добавлений и 442 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -60,7 +60,7 @@ public:
NS_DECL_NSIACCESSIBLETREECACHE
nsXULTreeAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
virtual ~nsXULTreeAccessible() {};
virtual ~nsXULTreeAccessible() {}
/* ----- nsIAccessible ----- */
NS_IMETHOD Shutdown();

Просмотреть файл

@ -50,7 +50,7 @@ class nsNetscapeProfileMigratorBase
{
public:
nsNetscapeProfileMigratorBase();
virtual ~nsNetscapeProfileMigratorBase() { };
virtual ~nsNetscapeProfileMigratorBase() { }
public:
typedef nsresult(*prefConverter)(void*, nsIPrefBranch*);

Просмотреть файл

@ -181,7 +181,7 @@ public:
} TAG;
protected:
nsOperaCookieMigrator() { };
nsOperaCookieMigrator() { }
nsresult ReadHeader();

Просмотреть файл

@ -51,10 +51,10 @@ public:
NS_DECL_NSIPROFILEMIGRATOR
NS_DECL_ISUPPORTS
nsProfileMigrator() { };
nsProfileMigrator() { }
protected:
~nsProfileMigrator() { };
~nsProfileMigrator() { }
nsresult GetDefaultBrowserMigratorKey(nsACString& key,
nsCOMPtr<nsIBrowserProfileMigrator>& bpm);

Просмотреть файл

@ -117,7 +117,7 @@ protected:
prettyName(aPrettyName),
cert(aCert)
{
};
}
nsCString fingerprint;
nsCString subjectName;
nsCString prettyName;

Просмотреть файл

@ -1223,8 +1223,8 @@ nsContentIterator::GetCurrentNode()
class nsContentSubtreeIterator : public nsContentIterator
{
public:
nsContentSubtreeIterator() {};
virtual ~nsContentSubtreeIterator() {};
nsContentSubtreeIterator() {}
virtual ~nsContentSubtreeIterator() {}
// nsContentIterator overrides ------------------------------

Просмотреть файл

@ -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);

Просмотреть файл

@ -136,7 +136,7 @@ public:
nsIContent* aContent2);
protected:
virtual ~nsNode3Tearoff() {};
virtual ~nsNode3Tearoff() {}
private:
nsCOMPtr<nsIContent> mContent;

Просмотреть файл

@ -329,7 +329,7 @@ public:
mNewScope(aNewScope),
mNodesWithProperties(aNodesWithProperties)
{
};
}
nsIDOMElement *mElement;
nsNodeInfoManager *mNewNodeInfoManager;

Просмотреть файл

@ -99,10 +99,10 @@ public:
mFormProcessor(aFormProcessor),
mBidiOptions(aBidiOptions)
{
};
}
virtual ~nsFormSubmission()
{
};
}
NS_DECL_ISUPPORTS

Просмотреть файл

@ -2855,7 +2855,7 @@ nsHTMLInputElement::VisitGroup(nsIRadioVisitor* aVisitor, PRBool aFlushContent)
class nsRadioVisitor : public nsIRadioVisitor {
public:
nsRadioVisitor() { }
virtual ~nsRadioVisitor() { };
virtual ~nsRadioVisitor() { }
NS_DECL_ISUPPORTS

Просмотреть файл

@ -65,7 +65,7 @@ class nsHTMLScriptEventHandler : public nsIScriptEventHandler
{
public:
nsHTMLScriptEventHandler(nsIDOMHTMLScriptElement *aOuter);
virtual ~nsHTMLScriptEventHandler() {};
virtual ~nsHTMLScriptEventHandler() {}
// nsISupports
NS_DECL_ISUPPORTS

Просмотреть файл

@ -253,7 +253,7 @@ protected:
PRInt32 GetDefaultNamespaceID() const
{
return mDefaultNamespaceID;
};
}
nsCOMArray<nsIDOMHTMLMapElement> mImageMaps;

Просмотреть файл

@ -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; }

Просмотреть файл

@ -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; }

Просмотреть файл

@ -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;

Просмотреть файл

@ -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)

Просмотреть файл

@ -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);

Просмотреть файл

@ -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,

Просмотреть файл

@ -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,

Просмотреть файл

@ -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

Просмотреть файл

@ -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:

Просмотреть файл

@ -93,7 +93,7 @@ public:
const nsACString& aRef,
nsXBLPrototypeHandler** aResult);
nsXBLSpecialDocInfo() : mInitialized(PR_FALSE) {};
nsXBLSpecialDocInfo() : mInitialized(PR_FALSE) {}
};
const char nsXBLSpecialDocInfo::sHTMLBindingStr[] =

Просмотреть файл

@ -60,7 +60,7 @@ public:
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent)
{
return NS_OK;
};
}
NS_IMETHOD KeyUp(nsIDOMEvent* aKeyEvent);
NS_IMETHOD KeyDown(nsIDOMEvent* aKeyEvent);

Просмотреть файл

@ -54,7 +54,7 @@ public:
*/
virtual ~txObject()
{
};
}
};
/**

Просмотреть файл

@ -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
{

Просмотреть файл

@ -750,4 +750,4 @@ TX_InitEXSLTFunction()
}
return PR_TRUE;
}
}

Просмотреть файл

@ -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,

Просмотреть файл

@ -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.

Просмотреть файл

@ -133,7 +133,7 @@ protected:
virtual nsIXTFElement* GetXTFElement() const
{
return mXTFElement;
};
}
// implementation helpers:
PRBool QueryInterfaceInner(REFNSIID aIID, void** result);

Просмотреть файл

@ -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:

Просмотреть файл

@ -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

Просмотреть файл

@ -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)
{

Просмотреть файл

@ -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);

Просмотреть файл

@ -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();

Просмотреть файл

@ -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();

Просмотреть файл

@ -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)

Просмотреть файл

@ -199,9 +199,9 @@ public:
nsDOMStorageList()
{
mStorages.Init();
};
}
virtual ~nsDOMStorageList() {};
virtual ~nsDOMStorageList() {}
// nsISupports
NS_DECL_ISUPPORTS

Просмотреть файл

@ -50,8 +50,8 @@ class nsSessionStorageEntry;
class nsDOMStorageDB
{
public:
nsDOMStorageDB() {};
~nsDOMStorageDB() {};
nsDOMStorageDB() {}
~nsDOMStorageDB() {}
nsresult
Init();

Просмотреть файл

@ -52,7 +52,7 @@ class nsComposeTxtSrvFilter : public nsITextServicesFilter
{
public:
nsComposeTxtSrvFilter();
virtual ~nsComposeTxtSrvFilter() {};
virtual ~nsComposeTxtSrvFilter() {}
// nsISupports interface...
NS_DECL_ISUPPORTS

Просмотреть файл

@ -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();
};

Просмотреть файл

@ -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() {}
};

Просмотреть файл

@ -241,9 +241,9 @@ class nsTextRulesInfo : public nsRulesInfo
alignType(0),
blockType(0),
insertElement(0)
{};
{}
virtual ~nsTextRulesInfo() {};
virtual ~nsTextRulesInfo() {}
// kInsertText
const nsAString *inString;

Просмотреть файл

@ -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;

Просмотреть файл

@ -80,11 +80,11 @@ class ProgressListener : public nsIWebProgressListener2
public:
ProgressListener(EmbedDownload *aDownload):mDownload(aDownload)
{
};
}
~ProgressListener(void)
{
};
}
NS_DECL_ISUPPORTS
NS_DECL_NSIWEBPROGRESSLISTENER

Просмотреть файл

@ -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);

Просмотреть файл

@ -85,8 +85,8 @@ class nsIDirectoryServiceProvider;
class EmbedCommon {
public:
EmbedCommon() {
};
~EmbedCommon() { };
}
~EmbedCommon() { }
static EmbedCommon* GetInstance();
static void DeleteInstance();
nsresult Init(void);

Просмотреть файл

@ -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) ;

Просмотреть файл

@ -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;

Просмотреть файл

@ -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__

Просмотреть файл

@ -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__ */

Просмотреть файл

@ -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);

Просмотреть файл

@ -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;

Просмотреть файл

@ -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;

Просмотреть файл

@ -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;

Просмотреть файл

@ -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);

Просмотреть файл

@ -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);

Просмотреть файл

@ -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);

Просмотреть файл

@ -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);

Просмотреть файл

@ -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; }

Просмотреть файл

@ -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();

Просмотреть файл

@ -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();

Просмотреть файл

@ -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();

Просмотреть файл

@ -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();

Просмотреть файл

@ -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;

Просмотреть файл

@ -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;

Просмотреть файл

@ -344,7 +344,7 @@ struct ResolveData {
mCallback(aCallback),
mGenericFamily(aGenericFamily),
mClosure(aClosure) {
};
}
gfxFontGroup::FontCreationCallback mCallback;
nsCString mGenericFamily;
void *mClosure;

Просмотреть файл

@ -98,8 +98,8 @@ class nsCyrillicDetector
for(PRUintn i=0;i<mItems;i++)
mProb[i] = mLastCls[i] =0;
mDone = PR_FALSE;
};
virtual ~nsCyrillicDetector() {};
}
virtual ~nsCyrillicDetector() {}
virtual void HandleData(const char* aBuf, PRUint32 aLen);
virtual void DataEnd();
protected:
@ -158,28 +158,28 @@ class nsRUProbDetector : public nsCyrXPCOMDetector
{
public:
nsRUProbDetector()
: nsCyrXPCOMDetector(5, gCyrillicCls, gRussian) {};
: nsCyrXPCOMDetector(5, gCyrillicCls, gRussian) {}
};
class nsRUStringProbDetector : public nsCyrXPCOMStringDetector
{
public:
nsRUStringProbDetector()
: nsCyrXPCOMStringDetector(5, gCyrillicCls, gRussian) {};
: nsCyrXPCOMStringDetector(5, gCyrillicCls, gRussian) {}
};
class nsUKProbDetector : public nsCyrXPCOMDetector
{
public:
nsUKProbDetector()
: nsCyrXPCOMDetector(5, gCyrillicCls, gUkrainian) {};
: nsCyrXPCOMDetector(5, gCyrillicCls, gUkrainian) {}
};
class nsUKStringProbDetector : public nsCyrXPCOMStringDetector
{
public:
nsUKStringProbDetector()
: nsCyrXPCOMStringDetector(5, gCyrillicCls, gUkrainian) {};
: nsCyrXPCOMStringDetector(5, gCyrillicCls, gUkrainian) {}
};
#endif

Просмотреть файл

@ -89,19 +89,19 @@ private:
class ns1stBlkDbgDetector : public nsDebugDetector
{
public:
ns1stBlkDbgDetector () : nsDebugDetector(k1stBlk) {} ;
ns1stBlkDbgDetector () : nsDebugDetector(k1stBlk) {}
};
class ns2ndBlkDbgDetector : public nsDebugDetector
{
public:
ns2ndBlkDbgDetector () : nsDebugDetector(k2ndBlk) {} ;
ns2ndBlkDbgDetector () : nsDebugDetector(k2ndBlk) {}
};
class nsLastBlkDbgDetector : public nsDebugDetector
{
public:
nsLastBlkDbgDetector () : nsDebugDetector(klastBlk) {} ;
nsLastBlkDbgDetector () : nsDebugDetector(klastBlk) {}
};
#endif // nsDebugDetector_h__

Просмотреть файл

@ -76,7 +76,7 @@ class nsMyObserver : public nsICharsetDetectionObserver
// Methods to support nsICharsetDetectionObserver
NS_IMETHOD Notify(const char* aCharset, nsDetectionConfident aConf);
void SetNotifyByReload(PRBool aByReload) { mNotifyByReload = aByReload; };
void SetNotifyByReload(PRBool aByReload) { mNotifyByReload = aByReload; }
private:
nsCOMPtr<nsIWebShellServices> 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<nsICharsetDetector> mDetector;

Просмотреть файл

@ -48,8 +48,8 @@ class nsObserverBase {
public:
nsObserverBase() {};
virtual ~nsObserverBase() {};
nsObserverBase() {}
virtual ~nsObserverBase() {}
/*
* Subject call observer when the parser hit the tag

Просмотреть файл

@ -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__

Просмотреть файл

@ -55,7 +55,7 @@ public:
NS_IMETHOD CreateCollation(nsILocale* locale, nsICollation** instancePtr);
nsCollationFactory() {};
nsCollationFactory() {}
};

Просмотреть файл

@ -46,8 +46,8 @@ class nsUTF8ConverterService: public nsIUTF8ConverterService {
NS_DECL_NSIUTF8CONVERTERSERVICE
public:
nsUTF8ConverterService() {};
virtual ~nsUTF8ConverterService() {};
nsUTF8ConverterService() {}
virtual ~nsUTF8ConverterService() {}
};
#endif // nsUTF8ConverterService_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;

Просмотреть файл

@ -56,7 +56,7 @@ public:
/**
* Class constructor.
*/
nsCP936ToUnicode(){};
nsCP936ToUnicode(){}
};

Просмотреть файл

@ -57,7 +57,7 @@ public:
/**
* Class constructor.
*/
nsGB2312ToUnicodeV2(){};
nsGB2312ToUnicodeV2(){}
};

Просмотреть файл

@ -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,

Просмотреть файл

@ -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:
};

Просмотреть файл

@ -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();

Просмотреть файл

@ -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

Просмотреть файл

@ -56,7 +56,7 @@ public:
/**
* Class constructor.
*/
nsUnicodeToCP936() {};
nsUnicodeToCP936() {}
};

Просмотреть файл

@ -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:

Просмотреть файл

@ -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:

Просмотреть файл

@ -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:
};
//-----------------------------------------------------------------------

Просмотреть файл

@ -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);
};

Просмотреть файл

@ -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:

Просмотреть файл

@ -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 {

Просмотреть файл

@ -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 {

Просмотреть файл

@ -46,7 +46,7 @@ class nsUTF16ToUnicodeBase : public nsBasicDecoderSupport
{
protected:
// ctor accessible only by child classes
nsUTF16ToUnicodeBase() { Reset();};
nsUTF16ToUnicodeBase() { Reset();}
public:
//--------------------------------------------------------------------

Просмотреть файл

@ -49,8 +49,8 @@ public:
/**
* Class constructor.
*/
nsUnicodeToLangBoxArabic16() {};
virtual ~nsUnicodeToLangBoxArabic16() {};
nsUnicodeToLangBoxArabic16() {}
virtual ~nsUnicodeToLangBoxArabic16() {}
NS_IMETHOD Convert(
const PRUnichar * aSrc, PRInt32 * aSrcLength,

Просмотреть файл

@ -48,8 +48,8 @@ public:
/**
* Class constructor.
*/
nsUnicodeToLangBoxArabic8() {};
virtual ~nsUnicodeToLangBoxArabic8() {};
nsUnicodeToLangBoxArabic8() {}
virtual ~nsUnicodeToLangBoxArabic8() {}
NS_IMETHOD Convert(
const PRUnichar * aSrc, PRInt32 * aSrcLength,

Просмотреть файл

@ -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);

Просмотреть файл

@ -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___ */

Просмотреть файл

@ -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;}
};

Просмотреть файл

@ -47,7 +47,7 @@ class nsCaseConversionImp2 : public nsICaseConversion {
NS_DECL_ISUPPORTS
public:
virtual ~nsCaseConversionImp2() { };
virtual ~nsCaseConversionImp2() { }
static nsCaseConversionImp2* GetInstance();

Просмотреть файл

@ -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*);

Просмотреть файл

@ -97,7 +97,7 @@ public:
~AutoPushJSContext();
nsresult ResultOfPush() { return mPushResult; };
nsresult ResultOfPush() { return mPushResult; }
private:
nsCOMPtr<nsIJSContextStack> mContextStack;

Просмотреть файл

@ -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);

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше