diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-17 15:15:41 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-17 15:15:41 -0800 |
| commit | b8a51e2c5b476d0db5b75799911f0c8626012e9c (patch) | |
| tree | 070a128be38b2d846c51e16dc514d10e686fb172 /xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp | |
| parent | 10cfea1fdafc8fcf1edd60bc783e9db9ef6229c0 (diff) | |
| download | pdfium-b8a51e2c5b476d0db5b75799911f0c8626012e9c.tar.xz | |
Make FWL_ classes more consistently named.
Rename IFWL_Target::m_pData to m_pImpl since it points
to CFWL_*Imp classes.
Rename CFWL_Widget:m_pImp to m_pIface since it points
to IFWL_* interface classes. Here, the concrete classes
have pointers to the corresponding interfaces, rather
than inheriting from them, and this is likely due to
someone not understanding virtual inheritance (since this
code has the diamond problem in spades).
Rename CFWL_Target to CWFL_TargetImp since it is the root
of the CFWL_*Imp hierarchy, and is pointed to by the
m_pImpl slot.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1446393002 .
Diffstat (limited to 'xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp')
| -rw-r--r-- | xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 0be09cab9c..6928349106 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -21,40 +21,40 @@ IFWL_MonthCalendar* IFWL_MonthCalendar::Create() { return new IFWL_MonthCalendar;
}
IFWL_MonthCalendar::IFWL_MonthCalendar() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_MonthCalendar::~IFWL_MonthCalendar() {
- if (m_pData) {
- delete (CFWL_MonthCalendarImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_MonthCalendarImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_MonthCalendar::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_MonthCalendarImp(pOuter);
- ((CFWL_MonthCalendarImp*)m_pData)->SetInterface(this);
- return ((CFWL_MonthCalendarImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_MonthCalendarImp(pOuter);
+ ((CFWL_MonthCalendarImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_MonthCalendarImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_MonthCalendar::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_MonthCalendarImp(properties, pOuter);
- ((CFWL_MonthCalendarImp*)m_pData)->SetInterface(this);
- return ((CFWL_MonthCalendarImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_MonthCalendarImp(properties, pOuter);
+ ((CFWL_MonthCalendarImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_MonthCalendarImp*)m_pImpl)->Initialize();
}
int32_t IFWL_MonthCalendar::CountSelect() {
- return ((CFWL_MonthCalendarImp*)m_pData)->CountSelect();
+ return ((CFWL_MonthCalendarImp*)m_pImpl)->CountSelect();
}
FX_BOOL IFWL_MonthCalendar::GetSelect(int32_t& iYear,
int32_t& iMonth,
int32_t& iDay,
int32_t nIndex) {
- return ((CFWL_MonthCalendarImp*)m_pData)
+ return ((CFWL_MonthCalendarImp*)m_pImpl)
->GetSelect(iYear, iMonth, iDay, nIndex);
}
FX_BOOL IFWL_MonthCalendar::SetSelect(int32_t iYear,
int32_t iMonth,
int32_t iDay) {
- return ((CFWL_MonthCalendarImp*)m_pData)->SetSelect(iYear, iMonth, iDay);
+ return ((CFWL_MonthCalendarImp*)m_pImpl)->SetSelect(iYear, iMonth, iDay);
}
CFWL_MonthCalendarImp::CFWL_MonthCalendarImp(IFWL_Widget* pOuter)
: CFWL_WidgetImp(pOuter),
|