summaryrefslogtreecommitdiff
path: root/fpdfsdk/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-27 16:07:42 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-27 16:07:42 -0700
commit14f57a153dcbc4c5fedeffe12a3b4f915cc5d558 (patch)
treec30bc8fde0acbac964db8bc9e96e893d57cc29f8 /fpdfsdk/include
parentcddfde0cddbc8467e0d5fa04c30405ee257750fc (diff)
downloadpdfium-14f57a153dcbc4c5fedeffe12a3b4f915cc5d558.tar.xz
Remove rendundant ../include from paths of files in include/ directory
Tiny bit of tidying I noticed while trying to figure out include rules. In other words, cd core/include git grep 'include.*include' git grep 'include.*src' Should produce no output, and cd fpdfsdk/include git grep 'include.*include' | grep -v ../core/include git grep 'include.*src' Should produce no output as well. Fix some IWYU, header guards, include ordering, whitespace along the way. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1162453003
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r--fpdfsdk/include/formfiller/FormFiller.h28
-rw-r--r--fpdfsdk/include/fsdk_rendercontext.h9
-rw-r--r--fpdfsdk/include/javascript/JavaScript.h45
-rw-r--r--fpdfsdk/include/pdfwindow/PDFWindow.h30
4 files changed, 39 insertions, 73 deletions
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index 8e45d5eddb..d8df542179 100644
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ b/fpdfsdk/include/formfiller/FormFiller.h
@@ -1,30 +1,18 @@
// 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 _FORMFILLER_H_
-#define _FORMFILLER_H_
-
-
-
-#ifndef _INC_PDFAPI
- #define _INC_PDFAPI
- #include "../../../core/include/fpdfapi/fpdf_module.h"
- #include "../../../core/include/fpdfdoc/fpdf_doc.h"
- #include "../../../core/include/fpdfdoc/fpdf_vt.h"
- #include "../../../core/include/fxcrt/fx_xml.h"
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#endif
+#ifndef FORMFILLER_H_
+#define FORMFILLER_H_
+#include "../../../core/include/fpdfapi/fpdf_module.h"
+#include "../../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../../core/include/fpdfdoc/fpdf_vt.h"
+#include "../../../core/include/fxcrt/fx_xml.h"
#include "../fsdk_mgr.h"
-
#include "../fxedit/fx_edit.h"
#include "../pdfwindow/IPDFWindow.h"
-
-
-#endif //_FORMFILLER_H_
-
+#endif // FORMFILLER_H_
diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h
index dfc9f5e58a..4c006c3754 100644
--- a/fpdfsdk/include/fsdk_rendercontext.h
+++ b/fpdfsdk/include/fsdk_rendercontext.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _RENDERCONTENT_H_
-#define _RENDERCONTENT_H_
+#ifndef FSDK_RENDERCONTEXT_H_
+#define FSDK_RENDERCONTEXT_H_
#include "../../public/fpdf_progressive.h"
-#include "../include/fsdk_define.h"
+#include "fsdk_define.h"
// Everything about rendering is put here: for OOM recovery
class CRenderContext
@@ -39,4 +39,5 @@ public:
private:
IFSDK_PAUSE* m_IPause;
};
-#endif
+
+#endif // FSDK_RENDERCONTEXT_H_
diff --git a/fpdfsdk/include/javascript/JavaScript.h b/fpdfsdk/include/javascript/JavaScript.h
index 166472b61e..4e545c4f54 100644
--- a/fpdfsdk/include/javascript/JavaScript.h
+++ b/fpdfsdk/include/javascript/JavaScript.h
@@ -1,39 +1,26 @@
// 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 _JAVASCRIPT_H_
-#define _JAVASCRIPT_H_
-
-
-#ifndef _INC_PDFAPI
- #define _INC_PDFAPI
-
- #include "../../../core/include/fpdfapi/fpdf_module.h"
- #include "../../../core/include/fpdfdoc/fpdf_doc.h"
- #include "../../../core/include/fpdfdoc/fpdf_vt.h"
- #include "../../../core/include/fxcrt/fx_xml.h"
- #include "../../../core/include/fdrm/fx_crypt.h"
- #include "../../../core/include/fpdfapi/fpdf_pageobj.h"
- #include "../../../core/include/fpdfapi/fpdf_serial.h"
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
- #include "../../include/fx_systemhandler.h"
-#endif
-
-
-#include "../jsapi/fxjs_v8.h"
-#include "../fxedit/fx_edit.h"
-#include "../pdfwindow/IPDFWindow.h"
-#include "../fsdk_mgr.h"
-
+#ifndef JAVASCRIPT_H_
+#define JAVASCRIPT_H_
#include <string>
-//#pragma warning( disable : 4786)
#include <vector>
+#include "../../../core/include/fdrm/fx_crypt.h"
+#include "../../../core/include/fpdfapi/fpdf_module.h"
+#include "../../../core/include/fpdfapi/fpdf_pageobj.h"
+#include "../../../core/include/fpdfapi/fpdf_serial.h"
+#include "../../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../../core/include/fpdfdoc/fpdf_vt.h"
+#include "../../../core/include/fxcrt/fx_xml.h"
+#include "../fsdk_mgr.h"
+#include "../fx_systemhandler.h"
+#include "../fxedit/fx_edit.h"
+#include "../jsapi/fxjs_v8.h"
+#include "../pdfwindow/IPDFWindow.h"
-#endif //_JAVASCRIPT_H_
-
+#endif // JAVASCRIPT_H_
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index a26c57d2db..dafc7452f2 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -1,28 +1,18 @@
// 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 _PDFWINDOW_H_
-#define _PDFWINDOW_H_
-// #define VC_EXTRALEAN
-// #include <afxext.h>
-// #include <afxcmn.h>
-
-#ifndef _INC_PDFAPI
- #define _INC_PDFAPI
-
- #include "../../../core/include/fpdfapi/fpdf_module.h"
- #include "../../../core/include/fpdfdoc/fpdf_doc.h"
- #include "../../../core/include/fpdfdoc/fpdf_vt.h"
- #include "../../../core/include/fxcrt/fx_xml.h"
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
- #include "../../../public/fpdf_fwlevent.h"
- #include "../fx_systemhandler.h"
-#endif
+#ifndef PDFWINDOW_H_
+#define PDFWINDOW_H_
+#include "../../../core/include/fpdfapi/fpdf_module.h"
+#include "../../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../../core/include/fpdfdoc/fpdf_vt.h"
+#include "../../../core/include/fxcrt/fx_xml.h"
+#include "../../../public/fpdf_fwlevent.h"
+#include "../fx_systemhandler.h"
#include "../fxedit/fx_edit.h"
-#endif
+#endif // PDFWINDOW_H_