diff options
Diffstat (limited to 'xfa/fwl')
-rw-r--r-- | xfa/fwl/core/cfwl_timer.cpp (renamed from xfa/fwl/core/ifwl_timer.cpp) | 8 | ||||
-rw-r--r-- | xfa/fwl/core/cfwl_timer.h (renamed from xfa/fwl/core/ifwl_timer.h) | 18 | ||||
-rw-r--r-- | xfa/fwl/core/cfwl_timerinfo.cpp (renamed from xfa/fwl/core/ifwl_timerinfo.cpp) | 4 | ||||
-rw-r--r-- | xfa/fwl/core/cfwl_timerinfo.h (renamed from xfa/fwl/core/ifwl_timerinfo.h) | 12 | ||||
-rw-r--r-- | xfa/fwl/core/ifwl_adaptertimermgr.h | 8 | ||||
-rw-r--r-- | xfa/fwl/core/ifwl_caret.cpp | 6 | ||||
-rw-r--r-- | xfa/fwl/core/ifwl_caret.h | 8 | ||||
-rw-r--r-- | xfa/fwl/core/ifwl_scrollbar.cpp | 6 | ||||
-rw-r--r-- | xfa/fwl/core/ifwl_scrollbar.h | 8 | ||||
-rw-r--r-- | xfa/fwl/core/ifwl_spinbutton.cpp | 6 | ||||
-rw-r--r-- | xfa/fwl/core/ifwl_spinbutton.h | 8 |
11 files changed, 46 insertions, 46 deletions
diff --git a/xfa/fwl/core/ifwl_timer.cpp b/xfa/fwl/core/cfwl_timer.cpp index e2436dcc34..289996e672 100644 --- a/xfa/fwl/core/ifwl_timer.cpp +++ b/xfa/fwl/core/cfwl_timer.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fwl/core/ifwl_timer.h" +#include "xfa/fwl/core/cfwl_timer.h" +#include "xfa/fwl/core/cfwl_timerinfo.h" #include "xfa/fwl/core/ifwl_adaptertimermgr.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_timerinfo.h" #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxfa/xfa_ffapp.h" -IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) { +CFWL_TimerInfo* CFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) { const IFWL_App* pApp = m_pWidget->GetOwnerApp(); if (!pApp) return nullptr; @@ -25,7 +25,7 @@ IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) { if (!pAdapterTimerMgr) return nullptr; - IFWL_TimerInfo* pTimerInfo = nullptr; + CFWL_TimerInfo* pTimerInfo = nullptr; pAdapterTimerMgr->Start(this, dwElapse, bImmediately, &pTimerInfo); return pTimerInfo; } diff --git a/xfa/fwl/core/ifwl_timer.h b/xfa/fwl/core/cfwl_timer.h index 848c16a717..2f91e783c8 100644 --- a/xfa/fwl/core/ifwl_timer.h +++ b/xfa/fwl/core/cfwl_timer.h @@ -4,24 +4,24 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FWL_CORE_IFWL_TIMER_H_ -#define XFA_FWL_CORE_IFWL_TIMER_H_ +#ifndef XFA_FWL_CORE_CFWL_TIMER_H_ +#define XFA_FWL_CORE_CFWL_TIMER_H_ #include "core/fxcrt/fx_system.h" -class IFWL_TimerInfo; +class CFWL_TimerInfo; class IFWL_Widget; -class IFWL_Timer { +class CFWL_Timer { public: - explicit IFWL_Timer(IFWL_Widget* parent) : m_pWidget(parent) {} - virtual ~IFWL_Timer() {} + explicit CFWL_Timer(IFWL_Widget* parent) : m_pWidget(parent) {} + virtual ~CFWL_Timer() {} - virtual void Run(IFWL_TimerInfo* hTimer) = 0; - IFWL_TimerInfo* StartTimer(uint32_t dwElapse, bool bImmediately); + virtual void Run(CFWL_TimerInfo* hTimer) = 0; + CFWL_TimerInfo* StartTimer(uint32_t dwElapse, bool bImmediately); protected: IFWL_Widget* m_pWidget; // Not owned. }; -#endif // XFA_FWL_CORE_IFWL_TIMER_H_ +#endif // XFA_FWL_CORE_CFWL_TIMER_H_ diff --git a/xfa/fwl/core/ifwl_timerinfo.cpp b/xfa/fwl/core/cfwl_timerinfo.cpp index a130eea453..8322a1d6aa 100644 --- a/xfa/fwl/core/ifwl_timerinfo.cpp +++ b/xfa/fwl/core/cfwl_timerinfo.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fwl/core/ifwl_timerinfo.h" +#include "xfa/fwl/core/cfwl_timerinfo.h" #include "xfa/fwl/core/ifwl_adaptertimermgr.h" -void IFWL_TimerInfo::StopTimer() { +void CFWL_TimerInfo::StopTimer() { m_pMgr->Stop(this); } diff --git a/xfa/fwl/core/ifwl_timerinfo.h b/xfa/fwl/core/cfwl_timerinfo.h index 9a18ddd567..5365d38305 100644 --- a/xfa/fwl/core/ifwl_timerinfo.h +++ b/xfa/fwl/core/cfwl_timerinfo.h @@ -4,19 +4,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FWL_CORE_IFWL_TIMERINFO_H_ -#define XFA_FWL_CORE_IFWL_TIMERINFO_H_ +#ifndef XFA_FWL_CORE_CFWL_TIMERINFO_H_ +#define XFA_FWL_CORE_CFWL_TIMERINFO_H_ #include "core/fxcrt/fx_system.h" class IFWL_AdapterTimerMgr; -class IFWL_TimerInfo { +class CFWL_TimerInfo { public: - explicit IFWL_TimerInfo(IFWL_AdapterTimerMgr* mgr) : m_pMgr(mgr) { + explicit CFWL_TimerInfo(IFWL_AdapterTimerMgr* mgr) : m_pMgr(mgr) { ASSERT(mgr); } - virtual ~IFWL_TimerInfo() {} + virtual ~CFWL_TimerInfo() {} void StopTimer(); @@ -24,4 +24,4 @@ class IFWL_TimerInfo { IFWL_AdapterTimerMgr* m_pMgr; // Not owned. }; -#endif // XFA_FWL_CORE_IFWL_TIMERINFO_H_ +#endif // XFA_FWL_CORE_CFWL_TIMERINFO_H_ diff --git a/xfa/fwl/core/ifwl_adaptertimermgr.h b/xfa/fwl/core/ifwl_adaptertimermgr.h index ad54f46312..0e07052e65 100644 --- a/xfa/fwl/core/ifwl_adaptertimermgr.h +++ b/xfa/fwl/core/ifwl_adaptertimermgr.h @@ -7,15 +7,15 @@ #ifndef XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_ #define XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_ -#include "xfa/fwl/core/ifwl_timer.h" +#include "xfa/fwl/core/cfwl_timer.h" class IFWL_AdapterTimerMgr { public: - virtual void Start(IFWL_Timer* pTimer, + virtual void Start(CFWL_Timer* pTimer, uint32_t dwElapse, bool bImmediately, - IFWL_TimerInfo** pTimerInfo) = 0; - virtual void Stop(IFWL_TimerInfo* pTimerInfo) = 0; + CFWL_TimerInfo** pTimerInfo) = 0; + virtual void Stop(CFWL_TimerInfo* pTimerInfo) = 0; }; #endif // XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_ diff --git a/xfa/fwl/core/ifwl_caret.cpp b/xfa/fwl/core/ifwl_caret.cpp index 5dcebc1cbb..fb5d5e54a1 100644 --- a/xfa/fwl/core/ifwl_caret.cpp +++ b/xfa/fwl/core/ifwl_caret.cpp @@ -11,9 +11,9 @@ #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_notedriver.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/cfwl_timerinfo.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_themeprovider.h" -#include "xfa/fwl/core/ifwl_timerinfo.h" namespace { @@ -92,9 +92,9 @@ void IFWL_Caret::OnDrawWidget(CFX_Graphics* pGraphics, DrawWidget(pGraphics, pMatrix); } -IFWL_Caret::Timer::Timer(IFWL_Caret* pCaret) : IFWL_Timer(pCaret) {} +IFWL_Caret::Timer::Timer(IFWL_Caret* pCaret) : CFWL_Timer(pCaret) {} -void IFWL_Caret::Timer::Run(IFWL_TimerInfo* pTimerInfo) { +void IFWL_Caret::Timer::Run(CFWL_TimerInfo* pTimerInfo) { IFWL_Caret* pCaret = static_cast<IFWL_Caret*>(m_pWidget); pCaret->SetStates(FWL_STATE_CAT_HightLight, !(pCaret->GetStates() & FWL_STATE_CAT_HightLight)); diff --git a/xfa/fwl/core/ifwl_caret.h b/xfa/fwl/core/ifwl_caret.h index d75a662175..57d0025a6b 100644 --- a/xfa/fwl/core/ifwl_caret.h +++ b/xfa/fwl/core/ifwl_caret.h @@ -9,7 +9,7 @@ #include <memory> -#include "xfa/fwl/core/ifwl_timer.h" +#include "xfa/fwl/core/cfwl_timer.h" #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" @@ -36,12 +36,12 @@ class IFWL_Caret : public IFWL_Widget { void ShowCaret(bool bFlag = true); private: - class Timer : public IFWL_Timer { + class Timer : public CFWL_Timer { public: explicit Timer(IFWL_Caret* pCaret); ~Timer() override {} - void Run(IFWL_TimerInfo* hTimer) override; + void Run(CFWL_TimerInfo* hTimer) override; }; friend class IFWL_Caret::Timer; @@ -50,7 +50,7 @@ class IFWL_Caret : public IFWL_Widget { const CFX_Matrix* pMatrix); std::unique_ptr<IFWL_Caret::Timer> m_pTimer; - IFWL_TimerInfo* m_pTimerInfo; // not owned. + CFWL_TimerInfo* m_pTimerInfo; // not owned. }; #endif // XFA_FWL_CORE_IFWL_CARET_H_ diff --git a/xfa/fwl/core/ifwl_scrollbar.cpp b/xfa/fwl/core/ifwl_scrollbar.cpp index b4d6b5076a..6732e94a9a 100644 --- a/xfa/fwl/core/ifwl_scrollbar.cpp +++ b/xfa/fwl/core/ifwl_scrollbar.cpp @@ -16,8 +16,8 @@ #include "xfa/fwl/core/cfwl_notedriver.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themepart.h" +#include "xfa/fwl/core/cfwl_timerinfo.h" #include "xfa/fwl/core/ifwl_themeprovider.h" -#include "xfa/fwl/core/ifwl_timerinfo.h" #define FWL_SCROLLBAR_Elapse 500 #define FWL_SCROLLBAR_MinThumb 5 @@ -550,9 +550,9 @@ void IFWL_ScrollBar::DoMouseHover(int32_t iItem, Repaint(&rtItem); } -IFWL_ScrollBar::Timer::Timer(IFWL_ScrollBar* pToolTip) : IFWL_Timer(pToolTip) {} +IFWL_ScrollBar::Timer::Timer(IFWL_ScrollBar* pToolTip) : CFWL_Timer(pToolTip) {} -void IFWL_ScrollBar::Timer::Run(IFWL_TimerInfo* pTimerInfo) { +void IFWL_ScrollBar::Timer::Run(CFWL_TimerInfo* pTimerInfo) { IFWL_ScrollBar* pButton = static_cast<IFWL_ScrollBar*>(m_pWidget); if (pButton->m_pTimerInfo) diff --git a/xfa/fwl/core/ifwl_scrollbar.h b/xfa/fwl/core/ifwl_scrollbar.h index 06306c3c74..b6f2b02732 100644 --- a/xfa/fwl/core/ifwl_scrollbar.h +++ b/xfa/fwl/core/ifwl_scrollbar.h @@ -11,8 +11,8 @@ #include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/cfwl_evtscroll.h" +#include "xfa/fwl/core/cfwl_timer.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" -#include "xfa/fwl/core/ifwl_timer.h" #include "xfa/fwl/core/ifwl_widget.h" class IFWL_Widget; @@ -56,12 +56,12 @@ class IFWL_ScrollBar : public IFWL_Widget { void SetTrackPos(FX_FLOAT fTrackPos); private: - class Timer : public IFWL_Timer { + class Timer : public CFWL_Timer { public: explicit Timer(IFWL_ScrollBar* pToolTip); ~Timer() override {} - void Run(IFWL_TimerInfo* pTimerInfo) override; + void Run(CFWL_TimerInfo* pTimerInfo) override; }; friend class IFWL_ScrollBar::Timer; @@ -118,7 +118,7 @@ class IFWL_ScrollBar : public IFWL_Widget { void DoMouseLeave(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState); void DoMouseHover(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState); - IFWL_TimerInfo* m_pTimerInfo; + CFWL_TimerInfo* m_pTimerInfo; FX_FLOAT m_fRangeMin; FX_FLOAT m_fRangeMax; FX_FLOAT m_fPageSize; diff --git a/xfa/fwl/core/ifwl_spinbutton.cpp b/xfa/fwl/core/ifwl_spinbutton.cpp index b77c259de9..9706a41461 100644 --- a/xfa/fwl/core/ifwl_spinbutton.cpp +++ b/xfa/fwl/core/ifwl_spinbutton.cpp @@ -15,9 +15,9 @@ #include "xfa/fwl/core/cfwl_msgmouse.h" #include "xfa/fwl/core/cfwl_notedriver.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/cfwl_timerinfo.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_themeprovider.h" -#include "xfa/fwl/core/ifwl_timerinfo.h" namespace { @@ -374,9 +374,9 @@ void IFWL_SpinButton::OnKeyDown(CFWL_MsgKey* pMsg) { } IFWL_SpinButton::Timer::Timer(IFWL_SpinButton* pToolTip) - : IFWL_Timer(pToolTip) {} + : CFWL_Timer(pToolTip) {} -void IFWL_SpinButton::Timer::Run(IFWL_TimerInfo* pTimerInfo) { +void IFWL_SpinButton::Timer::Run(CFWL_TimerInfo* pTimerInfo) { IFWL_SpinButton* pButton = static_cast<IFWL_SpinButton*>(m_pWidget); if (!pButton->m_pTimerInfo) diff --git a/xfa/fwl/core/ifwl_spinbutton.h b/xfa/fwl/core/ifwl_spinbutton.h index bc4f3ab1a8..157c1411db 100644 --- a/xfa/fwl/core/ifwl_spinbutton.h +++ b/xfa/fwl/core/ifwl_spinbutton.h @@ -10,7 +10,7 @@ #include <memory> #include "xfa/fwl/core/cfwl_event.h" -#include "xfa/fwl/core/ifwl_timer.h" +#include "xfa/fwl/core/cfwl_timer.h" #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxfa/cxfa_eventparam.h" @@ -38,12 +38,12 @@ class IFWL_SpinButton : public IFWL_Widget { const CFX_Matrix* pMatrix) override; private: - class Timer : public IFWL_Timer { + class Timer : public CFWL_Timer { public: explicit Timer(IFWL_SpinButton* pToolTip); ~Timer() override {} - void Run(IFWL_TimerInfo* pTimerInfo) override; + void Run(CFWL_TimerInfo* pTimerInfo) override; }; friend class IFWL_SpinButton::Timer; @@ -69,7 +69,7 @@ class IFWL_SpinButton : public IFWL_Widget { uint32_t m_dwDnState; int32_t m_iButtonIndex; bool m_bLButtonDwn; - IFWL_TimerInfo* m_pTimerInfo; + CFWL_TimerInfo* m_pTimerInfo; IFWL_SpinButton::Timer m_Timer; }; |