summaryrefslogtreecommitdiff
path: root/core/fxcrt
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcrt')
-rw-r--r--core/fxcrt/cfx_fileaccess_posix.cpp2
-rw-r--r--core/fxcrt/cfx_fileaccess_posix.h6
-rw-r--r--core/fxcrt/cfx_fileaccess_windows.cpp2
-rw-r--r--core/fxcrt/cfx_fileaccess_windows.h6
-rw-r--r--core/fxcrt/fileaccess_iface.h (renamed from core/fxcrt/ifx_fileaccess.h)12
-rw-r--r--core/fxcrt/fx_stream.cpp10
-rw-r--r--core/fxcrt/locale_iface.h (renamed from core/fxcrt/ifx_locale.h)10
-rw-r--r--core/fxcrt/pauseindicator_iface.h (renamed from core/fxcrt/ifx_pauseindicator.h)10
8 files changed, 29 insertions, 29 deletions
diff --git a/core/fxcrt/cfx_fileaccess_posix.cpp b/core/fxcrt/cfx_fileaccess_posix.cpp
index 2f85670c59..4aab6fef46 100644
--- a/core/fxcrt/cfx_fileaccess_posix.cpp
+++ b/core/fxcrt/cfx_fileaccess_posix.cpp
@@ -41,7 +41,7 @@ void GetFileMode(uint32_t dwModes, int32_t& nFlags, int32_t& nMasks) {
} // namespace
// static
-std::unique_ptr<IFX_FileAccess> IFX_FileAccess::Create() {
+std::unique_ptr<FileAccessIface> FileAccessIface::Create() {
return pdfium::MakeUnique<CFX_FileAccess_Posix>();
}
diff --git a/core/fxcrt/cfx_fileaccess_posix.h b/core/fxcrt/cfx_fileaccess_posix.h
index efa25ebb4c..84fc81bd98 100644
--- a/core/fxcrt/cfx_fileaccess_posix.h
+++ b/core/fxcrt/cfx_fileaccess_posix.h
@@ -7,17 +7,17 @@
#ifndef CORE_FXCRT_CFX_FILEACCESS_POSIX_H_
#define CORE_FXCRT_CFX_FILEACCESS_POSIX_H_
-#include "core/fxcrt/ifx_fileaccess.h"
+#include "core/fxcrt/fileaccess_iface.h"
#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ || \
_FX_PLATFORM_ == _FX_PLATFORM_APPLE_ || \
_FX_PLATFORM_ == _FX_PLATFORM_ANDROID_
-class CFX_FileAccess_Posix : public IFX_FileAccess {
+class CFX_FileAccess_Posix : public FileAccessIface {
public:
CFX_FileAccess_Posix();
~CFX_FileAccess_Posix() override;
- // IFX_FileAccess:
+ // FileAccessIface:
bool Open(const ByteStringView& fileName, uint32_t dwMode) override;
bool Open(const WideStringView& fileName, uint32_t dwMode) override;
void Close() override;
diff --git a/core/fxcrt/cfx_fileaccess_windows.cpp b/core/fxcrt/cfx_fileaccess_windows.cpp
index 1ac4496edb..f416bb6b77 100644
--- a/core/fxcrt/cfx_fileaccess_windows.cpp
+++ b/core/fxcrt/cfx_fileaccess_windows.cpp
@@ -32,7 +32,7 @@ void GetFileMode(uint32_t dwMode,
} // namespace
// static
-std::unique_ptr<IFX_FileAccess> IFX_FileAccess::Create() {
+std::unique_ptr<FileAccessIface> FileAccessIface::Create() {
return pdfium::MakeUnique<CFX_FileAccess_Windows>();
}
diff --git a/core/fxcrt/cfx_fileaccess_windows.h b/core/fxcrt/cfx_fileaccess_windows.h
index 6fd07d553c..451462bbca 100644
--- a/core/fxcrt/cfx_fileaccess_windows.h
+++ b/core/fxcrt/cfx_fileaccess_windows.h
@@ -7,15 +7,15 @@
#ifndef CORE_FXCRT_CFX_FILEACCESS_WINDOWS_H_
#define CORE_FXCRT_CFX_FILEACCESS_WINDOWS_H_
-#include "core/fxcrt/ifx_fileaccess.h"
+#include "core/fxcrt/fileaccess_iface.h"
#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-class CFX_FileAccess_Windows : public IFX_FileAccess {
+class CFX_FileAccess_Windows : public FileAccessIface {
public:
CFX_FileAccess_Windows();
~CFX_FileAccess_Windows() override;
- // IFX_FileAccess
+ // FileAccessIface
bool Open(const ByteStringView& fileName, uint32_t dwMode) override;
bool Open(const WideStringView& fileName, uint32_t dwMode) override;
void Close() override;
diff --git a/core/fxcrt/ifx_fileaccess.h b/core/fxcrt/fileaccess_iface.h
index 9bfe2b4e63..c438f9ec47 100644
--- a/core/fxcrt/ifx_fileaccess.h
+++ b/core/fxcrt/fileaccess_iface.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_IFX_FILEACCESS_H_
-#define CORE_FXCRT_IFX_FILEACCESS_H_
+#ifndef CORE_FXCRT_FILEACCESS_IFACE_H_
+#define CORE_FXCRT_FILEACCESS_IFACE_H_
#include <algorithm>
#include <memory>
@@ -14,10 +14,10 @@
#include "core/fxcrt/fx_stream.h"
#include "core/fxcrt/fx_string.h"
-class IFX_FileAccess {
+class FileAccessIface {
public:
- static std::unique_ptr<IFX_FileAccess> Create();
- virtual ~IFX_FileAccess() {}
+ static std::unique_ptr<FileAccessIface> Create();
+ virtual ~FileAccessIface() {}
virtual bool Open(const ByteStringView& fileName, uint32_t dwMode) = 0;
virtual bool Open(const WideStringView& fileName, uint32_t dwMode) = 0;
@@ -35,4 +35,4 @@ class IFX_FileAccess {
virtual bool Truncate(FX_FILESIZE szFile) = 0;
};
-#endif // CORE_FXCRT_IFX_FILEACCESS_H_
+#endif // CORE_FXCRT_FILEACCESS_IFACE_H_
diff --git a/core/fxcrt/fx_stream.cpp b/core/fxcrt/fx_stream.cpp
index bd75ad6ec7..337cbb325c 100644
--- a/core/fxcrt/fx_stream.cpp
+++ b/core/fxcrt/fx_stream.cpp
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
+#include "core/fxcrt/fileaccess_iface.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "core/fxcrt/ifx_fileaccess.h"
#include "third_party/base/ptr_util.h"
namespace {
@@ -40,11 +40,11 @@ class CFX_CRTFileStream final : public IFX_SeekableStream {
bool Flush() override { return m_pFile->Flush(); }
private:
- explicit CFX_CRTFileStream(std::unique_ptr<IFX_FileAccess> pFA)
+ explicit CFX_CRTFileStream(std::unique_ptr<FileAccessIface> pFA)
: m_pFile(std::move(pFA)) {}
~CFX_CRTFileStream() override {}
- std::unique_ptr<IFX_FileAccess> m_pFile;
+ std::unique_ptr<FileAccessIface> m_pFile;
};
} // namespace
@@ -53,7 +53,7 @@ class CFX_CRTFileStream final : public IFX_SeekableStream {
RetainPtr<IFX_SeekableStream> IFX_SeekableStream::CreateFromFilename(
const char* filename,
uint32_t dwModes) {
- std::unique_ptr<IFX_FileAccess> pFA = IFX_FileAccess::Create();
+ std::unique_ptr<FileAccessIface> pFA = FileAccessIface::Create();
if (!pFA->Open(filename, dwModes))
return nullptr;
return pdfium::MakeRetain<CFX_CRTFileStream>(std::move(pFA));
@@ -63,7 +63,7 @@ RetainPtr<IFX_SeekableStream> IFX_SeekableStream::CreateFromFilename(
RetainPtr<IFX_SeekableStream> IFX_SeekableStream::CreateFromFilename(
const wchar_t* filename,
uint32_t dwModes) {
- std::unique_ptr<IFX_FileAccess> pFA = IFX_FileAccess::Create();
+ std::unique_ptr<FileAccessIface> pFA = FileAccessIface::Create();
if (!pFA->Open(filename, dwModes))
return nullptr;
return pdfium::MakeRetain<CFX_CRTFileStream>(std::move(pFA));
diff --git a/core/fxcrt/ifx_locale.h b/core/fxcrt/locale_iface.h
index 5918e7a183..0adfb19682 100644
--- a/core/fxcrt/ifx_locale.h
+++ b/core/fxcrt/locale_iface.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_IFX_LOCALE_H_
-#define CORE_FXCRT_IFX_LOCALE_H_
+#ifndef CORE_FXCRT_LOCALE_IFACE_H_
+#define CORE_FXCRT_LOCALE_IFACE_H_
#include "core/fxcrt/cfx_datetime.h"
#include "core/fxcrt/fx_string.h"
@@ -54,9 +54,9 @@ enum FX_DATETIMETYPE {
FX_DATETIMETYPE_TimeDate,
};
-class IFX_Locale {
+class LocaleIface {
public:
- virtual ~IFX_Locale() {}
+ virtual ~LocaleIface() {}
virtual WideString GetName() const = 0;
virtual WideString GetNumbericSymbol(FX_LOCALENUMSYMBOL eType) const = 0;
@@ -73,4 +73,4 @@ class IFX_Locale {
virtual WideString GetNumPattern(FX_LOCALENUMSUBCATEGORY eType) const = 0;
};
-#endif // CORE_FXCRT_IFX_LOCALE_H_
+#endif // CORE_FXCRT_LOCALE_IFACE_H_
diff --git a/core/fxcrt/ifx_pauseindicator.h b/core/fxcrt/pauseindicator_iface.h
index 79c6016706..c12b02e427 100644
--- a/core/fxcrt/ifx_pauseindicator.h
+++ b/core/fxcrt/pauseindicator_iface.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_IFX_PAUSEINDICATOR_H_
-#define CORE_FXCRT_IFX_PAUSEINDICATOR_H_
+#ifndef CORE_FXCRT_PAUSEINDICATOR_IFACE_H_
+#define CORE_FXCRT_PAUSEINDICATOR_IFACE_H_
-class IFX_PauseIndicator {
+class PauseIndicatorIface {
public:
- virtual ~IFX_PauseIndicator() {}
+ virtual ~PauseIndicatorIface() {}
virtual bool NeedToPauseNow() = 0;
};
-#endif // CORE_FXCRT_IFX_PAUSEINDICATOR_H_
+#endif // CORE_FXCRT_PAUSEINDICATOR_IFACE_H_