summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-08-14 22:23:47 -0700
committerLei Zhang <thestig@chromium.org>2015-08-14 22:23:47 -0700
commit0998538c4a5ad116caf020aa2bd82bd32a6f7772 (patch)
treef317e2514d1c73d9ff2208cf36d5ebbf4f9e50c8
parentda180e9fdd4385df024cc18046f62ca47bc74d74 (diff)
downloadpdfium-0998538c4a5ad116caf020aa2bd82bd32a6f7772.tar.xz
Merge to XFA: Cleanup: Fix some unneeded semi-colons and bad spacing.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1284193005 . (cherry picked from commit 632b807b386878afdb42322f0037f8998306f4a9) Review URL: https://codereview.chromium.org/1301453002 .
-rw-r--r--core/src/fpdfapi/fpdf_font/ttgsubtable.h2
-rw-r--r--core/src/fpdfdoc/pdf_vt.h16
-rw-r--r--core/src/fpdftext/text_int.h8
-rw-r--r--core/src/fxcodec/codec/codec_int.h4
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Context.h2
-rw-r--r--core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h2
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Module.h8
-rw-r--r--fpdfsdk/include/javascript/JS_Context.h2
-rw-r--r--fpdfsdk/include/javascript/JS_EventHandler.h2
-rw-r--r--fpdfsdk/include/javascript/JS_Runtime.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Icon.h4
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ScrollBar.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Wnd.h2
13 files changed, 28 insertions, 28 deletions
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
index 395544ddbf..67cda371c1 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
@@ -23,7 +23,7 @@ class CFX_GlyphMap {
};
class CFX_CTTGSUBTable {
public:
- CFX_CTTGSUBTable(void) : m_bFeautureMapLoad(FALSE), loaded(false){};
+ CFX_CTTGSUBTable(void) : m_bFeautureMapLoad(FALSE), loaded(false) {}
CFX_CTTGSUBTable(FT_Bytes gsub) : m_bFeautureMapLoad(FALSE), loaded(false) {
LoadGSUBTable(gsub);
}
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h
index 64811178eb..a237ef225e 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/src/fpdfdoc/pdf_vt.h
@@ -306,16 +306,16 @@ class CTypeset {
};
class CPDF_EditContainer {
public:
- CPDF_EditContainer() : m_rcPlate(0, 0, 0, 0), m_rcContent(0, 0, 0, 0){};
- virtual ~CPDF_EditContainer(){};
- virtual void SetPlateRect(const CPDF_Rect& rect) { m_rcPlate = rect; };
- virtual const CPDF_Rect& GetPlateRect() const { return m_rcPlate; };
+ CPDF_EditContainer() : m_rcPlate(0, 0, 0, 0), m_rcContent(0, 0, 0, 0) {}
+ virtual ~CPDF_EditContainer() {}
+ virtual void SetPlateRect(const CPDF_Rect& rect) { m_rcPlate = rect; }
+ virtual const CPDF_Rect& GetPlateRect() const { return m_rcPlate; }
virtual void SetContentRect(const CPVT_FloatRect& rect) {
m_rcContent = rect;
};
- virtual CPDF_Rect GetContentRect() const { return m_rcContent; };
- FX_FLOAT GetPlateWidth() const { return m_rcPlate.right - m_rcPlate.left; };
- FX_FLOAT GetPlateHeight() const { return m_rcPlate.top - m_rcPlate.bottom; };
+ virtual CPDF_Rect GetContentRect() const { return m_rcContent; }
+ FX_FLOAT GetPlateWidth() const { return m_rcPlate.right - m_rcPlate.left; }
+ FX_FLOAT GetPlateHeight() const { return m_rcPlate.top - m_rcPlate.bottom; }
CPVT_Size GetPlateSize() const {
return CPVT_Size(GetPlateWidth(), GetPlateHeight());
};
@@ -561,7 +561,7 @@ class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator {
FX_BOOL SetSection(const CPVT_Section& section) override;
void SetAt(int32_t nWordIndex) override;
void SetAt(const CPVT_WordPlace& place) override;
- const CPVT_WordPlace& GetAt() const override { return m_CurPos; };
+ const CPVT_WordPlace& GetAt() const override { return m_CurPos; }
private:
CPVT_WordPlace m_CurPos;
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index 701ee8af98..24b89f1681 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -47,7 +47,7 @@ class CPDF_TextPage : public IPDF_TextPage {
CPDF_TextPage(const CPDF_Page* pPage, int flags = 0);
CPDF_TextPage(const CPDF_PageObjects* pPage, int flags = 0);
CPDF_TextPage(const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions);
- ~CPDF_TextPage() override{};
+ ~CPDF_TextPage() override {}
// IPDF_TextPage
FX_BOOL ParseTextPage() override;
@@ -145,7 +145,7 @@ class CPDF_TextPage : public IPDF_TextPage {
class CPDF_TextPageFind : public IPDF_TextPageFind {
public:
CPDF_TextPageFind(const IPDF_TextPage* pTextPage);
- ~CPDF_TextPageFind() override{};
+ ~CPDF_TextPageFind() override {}
// IPDF_TextPageFind
FX_BOOL FindFirst(const CFX_WideString& findwhat,
@@ -191,11 +191,11 @@ class CPDF_TextPageFind : public IPDF_TextPageFind {
};
class CPDF_LinkExt {
public:
- CPDF_LinkExt(){};
+ CPDF_LinkExt() {}
int m_Start;
int m_Count;
CFX_WideString m_strUrl;
- virtual ~CPDF_LinkExt(){};
+ virtual ~CPDF_LinkExt() {}
};
typedef CFX_ArrayTemplate<CPDF_LinkExt*> LINK_InfoArray;
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h
index faf812051a..ae6af007f6 100644
--- a/core/src/fxcodec/codec/codec_int.h
+++ b/core/src/fxcodec/codec/codec_int.h
@@ -371,7 +371,7 @@ class CPDF_Jbig2Interface : public CJBig2_Module {
class CCodec_Jbig2Context {
public:
CCodec_Jbig2Context();
- ~CCodec_Jbig2Context(){};
+ ~CCodec_Jbig2Context() {}
FX_DWORD m_width;
FX_DWORD m_height;
@@ -388,7 +388,7 @@ class CCodec_Jbig2Context {
};
class CCodec_Jbig2Module : public ICodec_Jbig2Module {
public:
- CCodec_Jbig2Module(){};
+ CCodec_Jbig2Module() {}
~CCodec_Jbig2Module() override;
// ICodec_Jbig2Module
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h
index 07f886ee49..25261a17bf 100644
--- a/core/src/fxcodec/jbig2/JBig2_Context.h
+++ b/core/src/fxcodec/jbig2/JBig2_Context.h
@@ -66,7 +66,7 @@ class CJBig2_Context : public CJBig2_Object {
int32_t getNextPage(CJBig2_Image** image, IFX_Pause* pPause);
int32_t Continue(IFX_Pause* pPause);
- FXCODEC_STATUS GetProcessiveStatus() { return m_ProcessiveStatus; };
+ FXCODEC_STATUS GetProcessiveStatus() { return m_ProcessiveStatus; }
private:
CJBig2_Context(uint8_t* pGlobalData,
diff --git a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
index 3c9a39a19f..eb90f6b183 100644
--- a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
@@ -63,7 +63,7 @@ class CJBig2_GRDProc : public CJBig2_Object {
CJBig2_BitStream* pStream,
IFX_Pause* pPause = NULL);
FXCODEC_STATUS Continue_decode(IFX_Pause* pPause);
- FX_RECT GetReplaceRect() { return m_ReplaceRect; };
+ FX_RECT GetReplaceRect() { return m_ReplaceRect; }
private:
FXCODEC_STATUS decode_Arith(IFX_Pause* pPause);
diff --git a/core/src/fxcodec/jbig2/JBig2_Module.h b/core/src/fxcodec/jbig2/JBig2_Module.h
index c669afe696..53e47605ba 100644
--- a/core/src/fxcodec/jbig2/JBig2_Module.h
+++ b/core/src/fxcodec/jbig2/JBig2_Module.h
@@ -23,12 +23,12 @@ class CJBig2_Module {
virtual void JBig2_Free(void* pMem) = 0;
- virtual void JBig2_Assert(int32_t nExpression){};
+ virtual void JBig2_Assert(int32_t nExpression) {}
- virtual void JBig2_Error(const FX_CHAR* format, ...){};
+ virtual void JBig2_Error(const FX_CHAR* format, ...) {}
- virtual void JBig2_Warn(const FX_CHAR* format, ...){};
+ virtual void JBig2_Warn(const FX_CHAR* format, ...) {}
- virtual void JBig2_Log(const FX_CHAR* format, ...){};
+ virtual void JBig2_Log(const FX_CHAR* format, ...) {}
};
#endif
diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h
index a716bc2ccb..995d32219e 100644
--- a/fpdfsdk/include/javascript/JS_Context.h
+++ b/fpdfsdk/include/javascript/JS_Context.h
@@ -128,7 +128,7 @@ class CJS_Context : public IFXJS_Context {
FX_BOOL DoJob(int nMode, const CFX_WideString& script, CFX_WideString& info);
- CJS_EventHandler* GetEventHandler() { return m_pEventHandler; };
+ CJS_EventHandler* GetEventHandler() { return m_pEventHandler; }
CPDFSDK_Document* GetReaderDocument();
private:
diff --git a/fpdfsdk/include/javascript/JS_EventHandler.h b/fpdfsdk/include/javascript/JS_EventHandler.h
index 5e4982c1df..e03904897d 100644
--- a/fpdfsdk/include/javascript/JS_EventHandler.h
+++ b/fpdfsdk/include/javascript/JS_EventHandler.h
@@ -185,7 +185,7 @@ class CJS_EventHandler {
FX_BOOL WillCommit();
CFX_WideString TargetName();
- JS_EVENT_T EventType() { return m_eEventType; };
+ JS_EVENT_T EventType() { return m_eEventType; }
public:
CJS_Context* m_pJSContext;
diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h
index 2e397ea1ef..d512484230 100644
--- a/fpdfsdk/include/javascript/JS_Runtime.h
+++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -55,7 +55,7 @@ class CJS_Runtime : public IFXJS_Runtime {
FX_BOOL IsBlocking() { return m_bBlocking; }
operator IJS_Runtime*() { return (IJS_Runtime*)m_isolate; }
- v8::Isolate* GetIsolate() { return m_isolate; };
+ v8::Isolate* GetIsolate() { return m_isolate; }
void SetIsolate(v8::Isolate* isolate) { m_isolate = isolate; }
v8::Local<v8::Context> NewJSContext();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index 95157cad1f..827741106b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -38,7 +38,7 @@ class CPWL_Icon : public CPWL_Image {
CPWL_Icon();
~CPWL_Icon() override;
- virtual CPDF_IconFit* GetIconFit() { return m_pIconFit; };
+ virtual CPDF_IconFit* GetIconFit() { return m_pIconFit; }
// CPWL_Image
void GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) override;
@@ -49,7 +49,7 @@ class CPWL_Icon : public CPWL_Image {
void GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom);
FX_BOOL GetFittingBounds();
- void SetIconFit(CPDF_IconFit* pIconFit) { m_pIconFit = pIconFit; };
+ void SetIconFit(CPDF_IconFit* pIconFit) { m_pIconFit = pIconFit; }
private:
CPDF_IconFit* m_pIconFit;
diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
index ec1b78ed5e..b91d467daa 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
@@ -111,7 +111,7 @@ class CPWL_ScrollBar : public CPWL_Wnd {
void TimerProc() override;
FX_FLOAT GetScrollBarWidth() const;
- PWL_SCROLLBAR_TYPE GetScrollBarType() const { return m_sbType; };
+ PWL_SCROLLBAR_TYPE GetScrollBarType() const { return m_sbType; }
void SetNotifyForever(FX_BOOL bForever) { m_bNotifyForever = bForever; }
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 37af083835..e8340c34ad 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -422,7 +422,7 @@ class CPWL_Wnd : public CPWL_TimerHandler {
virtual void OnEnabled();
virtual void OnDisabled();
- void SetNotifyFlag(FX_BOOL bNotifying = TRUE) { m_bNotifying = bNotifying; };
+ void SetNotifyFlag(FX_BOOL bNotifying = TRUE) { m_bNotifying = bNotifying; }
FX_BOOL IsValid() const;
PWL_CREATEPARAM GetCreationParam() const;