summaryrefslogtreecommitdiff
path: root/xfa/fgas
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fgas')
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.h6
-rw-r--r--xfa/fgas/font/cfgas_pdffontmgr.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 946486be2a..642ba6fb67 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -14,10 +14,10 @@
#include <vector>
#include "core/fxcrt/cfx_crtfileaccess.h"
-#include "core/fxcrt/cfx_observable.h"
#include "core/fxcrt/cfx_retain_ptr.h"
#include "core/fxcrt/cfx_seekablestreamproxy.h"
#include "core/fxcrt/fx_extension.h"
+#include "core/fxcrt/observable.h"
#include "core/fxge/cfx_fontmapper.h"
#include "core/fxge/fx_freetype.h"
#include "core/fxge/ifx_systemfontinfo.h"
@@ -81,7 +81,7 @@ typedef void (*FX_LPEnumAllFonts)(std::deque<FX_FONTDESCRIPTOR>* fonts,
FX_LPEnumAllFonts FX_GetDefFontEnumerator();
-class CFGAS_FontMgr : public CFX_Observable<CFGAS_FontMgr> {
+class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> {
public:
static std::unique_ptr<CFGAS_FontMgr> Create(FX_LPEnumAllFonts pEnumerator);
@@ -180,7 +180,7 @@ class CFX_FontSourceEnum_File {
std::vector<ByteString> m_FolderPaths;
};
-class CFGAS_FontMgr : public CFX_Observable<CFGAS_FontMgr> {
+class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> {
public:
static std::unique_ptr<CFGAS_FontMgr> Create(
CFX_FontSourceEnum_File* pFontEnum);
diff --git a/xfa/fgas/font/cfgas_pdffontmgr.h b/xfa/fgas/font/cfgas_pdffontmgr.h
index 8a09a95bd1..a31d865cec 100644
--- a/xfa/fgas/font/cfgas_pdffontmgr.h
+++ b/xfa/fgas/font/cfgas_pdffontmgr.h
@@ -11,16 +11,16 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_document.h"
-#include "core/fxcrt/cfx_observable.h"
#include "core/fxcrt/cfx_retain_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/observable.h"
class CFGAS_FontMgr;
class CFGAS_GEFont;
class CPDF_Document;
class CPDF_Font;
-class CFGAS_PDFFontMgr : public CFX_Observable<CFGAS_PDFFontMgr> {
+class CFGAS_PDFFontMgr : public Observable<CFGAS_PDFFontMgr> {
public:
explicit CFGAS_PDFFontMgr(CPDF_Document* pDoc, CFGAS_FontMgr* pFontMgr);
~CFGAS_PDFFontMgr();