Clean up bookmark related codes.

core/include/fpdfdoc/fpdf_doc.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FPDF_DOC_H_
 #define _FPDF_DOC_H_
 #ifndef _FPDF_PARSER_
 #include "../fpdfapi/fpdf_parser.h"
@@ skipping 58 matching lines @@
         return m_pRoot;
     }
 
 protected:
 
     CPDF_Dictionary*            m_pRoot;
 };
 class CPDF_BookmarkTree : public CFX_Object
 {
 public:
+    CPDF_BookmarkTree(CPDF_Document* pDoc) : m_pDocument(pDoc) {}
 
-    CPDF_BookmarkTree(CPDF_Document* pDoc)
-    {
-        m_pDocument = pDoc;
-    }
-public:
+    CPDF_Bookmark               GetFirstChild(CPDF_Bookmark parent) const;

[Tom Sepez, 2015/01/05 18:08:32]

nit: args here should probably of type const CPDF_Bookmark&, but the bookmark is
small so the copy is likely to be insignificant.

[Bo Xu, 2015/01/05 18:45:09]

Done.

 
+    CPDF_Bookmark               GetNextSibling(CPDF_Bookmark bookmark) const;
 
+    CPDF_Document*              GetDocument() const { return m_pDocument; }
 
-    CPDF_Bookmark               GetFirstChild(CPDF_Bookmark parent);
-
-    CPDF_Bookmark               GetNextSibling(CPDF_Bookmark bookmark);
-
-
-    CPDF_Document*              GetDocument() const
-    {
-        return m_pDocument;
-    }
 protected:
-
     CPDF_Document*              m_pDocument;
 };
 #define PDFBOOKMARK_ITALIC                      1
 #define PDFBOOKMARK_BOLD                        2
 class CPDF_Bookmark : public CFX_Object
 {
 public:
 
-    CPDF_Bookmark(CPDF_Dictionary* pDict = NULL)
-    {
-        m_pDict = pDict;
-    }
+    CPDF_Bookmark(CPDF_Dictionary* pDict = NULL) : m_pDict(pDict) {}
 
-    operator CPDF_Dictionary*() const
-    {
-        return m_pDict;
-    }
+    CPDF_Dictionary* GetDict() const {return m_pDict;}

[Tom Sepez, 2015/01/05 18:08:32]

nit: space after { and before }.

[Bo Xu, 2015/01/05 18:45:09]

Done.

 
+    FX_DWORD                    GetColorRef() const;
 
+    FX_DWORD                    GetFontStyle() const;
 
-    FX_DWORD                    GetColorRef();
+    CFX_WideString              GetTitle() const;
 
-    FX_DWORD                    GetFontStyle();
+    CPDF_Dest                   GetDest(CPDF_Document* pDocument) const;
 
-    CFX_WideString              GetTitle();
-
-
-
-
-    CPDF_Dest                   GetDest(CPDF_Document* pDocument);
-
-    CPDF_Action                 GetAction();
-
+    CPDF_Action                 GetAction() const;
 
     CPDF_Dictionary*    m_pDict;
 };
 #define PDFZOOM_XYZ                                     1
 #define PDFZOOM_FITPAGE                         2
 #define PDFZOOM_FITHORZ                         3
 #define PDFZOOM_FITVERT                         4
 #define PDFZOOM_FITRECT                         5
 #define PDFZOOM_FITBBOX                         6
 #define PDFZOOM_FITBHORZ                        7
-
 #define PDFZOOM_FITBVERT                        8
 class CPDF_Dest : public CFX_Object
 {
 public:
 
     CPDF_Dest(CPDF_Object* pObj = NULL)
     {
         m_pObj = pObj;
     }
 
@@ skipping 1635 matching lines @@
     FX_FLOAT                            GetOriginalColor(int index, FX_BSTR csEntry);
 
     void                                        GetOriginalColor(int& iColorType, FX_FLOAT fc[4], FX_BSTR csEntry);
 
     CFX_WideString                      GetCaption(FX_BSTR csEntry);
 
     CPDF_Stream*                        GetIcon(FX_BSTR csEntry);
     friend class                        CPDF_FormControl;
 };
 #endif