diff options
Diffstat (limited to 'fpdfsdk/javascript')
-rw-r--r-- | fpdfsdk/javascript/app.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/resource.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/resource.h | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp index 6e5dc4a2c7..fc2a440da9 100644 --- a/fpdfsdk/javascript/app.cpp +++ b/fpdfsdk/javascript/app.cpp @@ -43,7 +43,7 @@ class GlobalTimer { CFX_WideString GetJScript() const { return m_swJScript; } private: - using TimerMap = std::map<FX_UINT, GlobalTimer*>; + using TimerMap = std::map<uint32_t, GlobalTimer*>; static TimerMap* GetGlobalTimerMap(); uint32_t m_nTimerID; diff --git a/fpdfsdk/javascript/resource.cpp b/fpdfsdk/javascript/resource.cpp index c4edeae905..6113c54338 100644 --- a/fpdfsdk/javascript/resource.cpp +++ b/fpdfsdk/javascript/resource.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/javascript/resource.h" -CFX_WideString JSGetStringFromID(FX_UINT id) { +CFX_WideString JSGetStringFromID(uint32_t id) { switch (id) { case IDS_STRING_JSALERT: return L"Alert"; diff --git a/fpdfsdk/javascript/resource.h b/fpdfsdk/javascript/resource.h index d775e94c5e..7f041cd21a 100644 --- a/fpdfsdk/javascript/resource.h +++ b/fpdfsdk/javascript/resource.h @@ -7,8 +7,7 @@ #ifndef FPDFSDK_JAVASCRIPT_RESOURCE_H_ #define FPDFSDK_JAVASCRIPT_RESOURCE_H_ -#include "core/fxcrt/include/fx_string.h" // For CFX_WideString. -#include "fpdfsdk/include/fsdk_define.h" // For FX_UINT. +#include "core/fxcrt/include/fx_string.h" class CJS_Context; @@ -33,7 +32,7 @@ class CJS_Context; #define IDS_STRING_JSNOPERMISSION 25639 #define IDS_STRING_JSBADOBJECT 25640 -CFX_WideString JSGetStringFromID(FX_UINT id); +CFX_WideString JSGetStringFromID(uint32_t id); CFX_WideString JSFormatErrorString(const char* class_name, const char* property_name, const CFX_WideString& details); |