diff options
Diffstat (limited to 'core/fxge/android')
-rw-r--r-- | core/fxge/android/fpf_skiafont.cpp | 2 | ||||
-rw-r--r-- | core/fxge/android/fpf_skiafont.h | 4 | ||||
-rw-r--r-- | core/fxge/android/fpf_skiafontmgr.cpp | 2 | ||||
-rw-r--r-- | core/fxge/android/fpf_skiafontmgr.h | 4 | ||||
-rw-r--r-- | core/fxge/android/fpf_skiamodule.h | 2 | ||||
-rw-r--r-- | core/fxge/android/fx_android_font.cpp | 2 | ||||
-rw-r--r-- | core/fxge/android/fx_android_font.h | 2 | ||||
-rw-r--r-- | core/fxge/android/fx_android_imp.cpp | 4 |
8 files changed, 11 insertions, 11 deletions
diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp index bd9b549e99..0d2069cd99 100644 --- a/core/fxge/android/fpf_skiafont.cpp +++ b/core/fxge/android/fpf_skiafont.cpp @@ -12,7 +12,7 @@ #include "core/fxge/android/fpf_skiafont.h" #include "core/fxge/android/fpf_skiafontmgr.h" -#include "core/include/fxge/fx_freetype.h" +#include "core/fxge/include/fx_freetype.h" #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) diff --git a/core/fxge/android/fpf_skiafont.h b/core/fxge/android/fpf_skiafont.h index 9e35c942d3..c21bdeadc4 100644 --- a/core/fxge/android/fpf_skiafont.h +++ b/core/fxge/android/fpf_skiafont.h @@ -11,8 +11,8 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "core/include/fxge/fpf.h" -#include "core/include/fxge/fx_font.h" +#include "core/fxge/include/fpf.h" +#include "core/fxge/include/fx_font.h" class CFPF_SkiaFontDescriptor; class CFPF_SkiaFontMgr; diff --git a/core/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp index 7d0d2de9e2..b7bc27acdf 100644 --- a/core/fxge/android/fpf_skiafontmgr.cpp +++ b/core/fxge/android/fpf_skiafontmgr.cpp @@ -16,7 +16,7 @@ #include "core/fxcrt/include/fx_ext.h" #include "core/fxge/android/fpf_skiafont.h" #include "core/fxge/android/fpf_skiafontmgr.h" -#include "core/include/fxge/fx_freetype.h" +#include "core/fxge/include/fx_freetype.h" #ifdef __cplusplus extern "C" { diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h index 5ed409cccc..e939a55cb9 100644 --- a/core/fxge/android/fpf_skiafontmgr.h +++ b/core/fxge/android/fpf_skiafontmgr.h @@ -14,8 +14,8 @@ #include <map> #include <vector> -#include "core/include/fxge/fpf.h" -#include "core/include/fxge/fx_font.h" +#include "core/fxge/include/fpf.h" +#include "core/fxge/include/fx_font.h" #define FPF_SKIAFONTTYPE_Unknown 0 #define FPF_SKIAFONTTYPE_Path 1 diff --git a/core/fxge/android/fpf_skiamodule.h b/core/fxge/android/fpf_skiamodule.h index a95c974b5d..95748493c7 100644 --- a/core/fxge/android/fpf_skiamodule.h +++ b/core/fxge/android/fpf_skiamodule.h @@ -9,7 +9,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "core/include/fxge/fpf.h" +#include "core/fxge/include/fpf.h" class CFPF_SkiaFontMgr; diff --git a/core/fxge/android/fx_android_font.cpp b/core/fxge/android/fx_android_font.cpp index d663ac0f4f..6554c66a13 100644 --- a/core/fxge/android/fx_android_font.cpp +++ b/core/fxge/android/fx_android_font.cpp @@ -9,7 +9,7 @@ #if _FX_OS_ == _FX_ANDROID_ #include "core/fxge/android/fx_android_font.h" -#include "core/include/fxge/fpf.h" +#include "core/fxge/include/fpf.h" CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) {} FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr* pFontMgr) { diff --git a/core/fxge/android/fx_android_font.h b/core/fxge/android/fx_android_font.h index ee8859185e..6268c3ed7b 100644 --- a/core/fxge/android/fx_android_font.h +++ b/core/fxge/android/fx_android_font.h @@ -11,7 +11,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "core/include/fxge/fx_font.h" +#include "core/fxge/include/fx_font.h" class IFPF_FontMgr; diff --git a/core/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp index 3fac3706cf..e508183fd8 100644 --- a/core/fxge/android/fx_android_imp.cpp +++ b/core/fxge/android/fx_android_imp.cpp @@ -9,8 +9,8 @@ #if _FX_OS_ == _FX_ANDROID_ #include "core/fxge/android/fx_android_font.h" -#include "core/include/fxge/fpf.h" -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fpf.h" +#include "core/fxge/include/fx_ge.h" void CFX_GEModule::InitPlatform() { IFPF_DeviceModule* pDeviceModule = FPF_GetDeviceModule(); |