Cleanup methds in IFWL_MonthCalendar

xfa/fwl/core/ifwl_monthcalendar.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/ifwl_monthcalendar.h"
 
 #include <algorithm>
 
@@ skipping 107 matching lines @@
       pTheme->GetCapacity(&params, CFWL_WidgetCapacity::December));
 }
 
 }  // namespace
 
 IFWL_MonthCalendar::IFWL_MonthCalendar(
     const IFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     IFWL_Widget* pOuter)
     : IFWL_Widget(app, std::move(properties), pOuter),
-      m_bInit(false),
+      m_bInitialized(false),
       m_pDateTime(new CFX_DateTime),
       m_iCurYear(2011),
       m_iCurMonth(1),
       m_iYear(2011),
       m_iMonth(1),
       m_iDay(1),
       m_iHovered(-1),
       m_iLBtnPartStates(CFWL_PartState_Normal),
       m_iRBtnPartStates(CFWL_PartState_Normal),
-      m_iMaxSel(1),
       m_bFlag(false) {
   m_rtHead.Reset();
   m_rtWeek.Reset();
   m_rtLBtn.Reset();
   m_rtRBtn.Reset();
   m_rtDates.Reset();
   m_rtHSep.Reset();
   m_rtHeadText.Reset();
   m_rtToday.Reset();
   m_rtTodayFlag.Reset();
@@ skipping 22 matching lines @@
 }
 
 void IFWL_MonthCalendar::Update() {
   if (IsLocked()) {
     return;
   }
   if (!m_pProperties->m_pThemeProvider) {
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
   }
   GetCapValue();
-  if (!m_bInit) {
-    m_bInit = InitDate();
+  if (!m_bInitialized) {
+    InitDate();
+    m_bInitialized = true;
   }
   ClearDateItem();
-  ReSetDateItem();
-  LayOut();
+  ResetDateItem();
+  Layout();
 }
 
 void IFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics,
                                     const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return;
   if (!m_pProperties->m_pThemeProvider) {
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
   }
   IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider;
@@ skipping 14 matching lines @@
   DrawWeek(pGraphics, pTheme, pMatrix);
   DrawDatesIn(pGraphics, pTheme, pMatrix);
   DrawDatesOut(pGraphics, pTheme, pMatrix);
   DrawToday(pGraphics, pTheme, pMatrix);
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_WeekNumbers) {
     DrawWeekNumberSep(pGraphics, pTheme, pMatrix);
     DrawWeekNumber(pGraphics, pTheme, pMatrix);
   }
 }
 
-int32_t IFWL_MonthCalendar::CountSelect() {
-  return m_arrSelDays.GetSize();
-}
-
-bool IFWL_MonthCalendar::GetSelect(int32_t& iYear,
-                                   int32_t& iMonth,
-                                   int32_t& iDay,
-                                   int32_t nIndex) {
-  if (nIndex >= m_arrSelDays.GetSize()) {
-    return false;
-  }
-  iYear = m_iCurYear;
-  iMonth = m_iCurMonth;
-  iDay = m_arrSelDays[nIndex];
-  return true;
-}
-
-bool IFWL_MonthCalendar::SetSelect(int32_t iYear,
+void IFWL_MonthCalendar::SetSelect(int32_t iYear,
                                    int32_t iMonth,
                                    int32_t iDay) {
   ChangeToMonth(iYear, iMonth);
-  return AddSelDay(iDay);
+  AddSelDay(iDay);
 }
 
 void IFWL_MonthCalendar::DrawBkground(CFX_Graphics* pGraphics,
                                       IFWL_ThemeProvider* pTheme,
                                       const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
   params.m_pWidget = this;
   params.m_iPart = CFWL_Part::Background;
   params.m_pGraphics = pGraphics;
   params.m_dwStates = CFWL_PartState_Normal;
@@ skipping 156 matching lines @@
   params.m_iPart = CFWL_Part::WeekNum;
   params.m_pGraphics = pGraphics;
   params.m_dwStates = CFWL_PartState_Normal;
   params.m_iTTOAlign = FDE_TTOALIGNMENT_CenterLeft;
   CFX_WideString wsWeekNum;
   params.m_dwTTOStyles = FDE_TTOSTYLE_SingleLine;
   params.m_iTTOAlign = FDE_TTOALIGNMENT_Center;
   if (pMatrix) {
     params.m_matrix.Concat(*pMatrix);
   }
-  int32_t iWeekNum = 0;
   int32_t iMonthNum = m_pDateTime->GetMonth();
   int32_t iDayNum = FX_DaysInMonth(m_iCurYear, iMonthNum);
   int32_t iTemp = 0;
   FX_FLOAT fVStartPos = m_rtClient.top + m_fHeadHei + m_fHSepHei;
   FX_FLOAT fHStartPos = m_rtClient.left;
   for (int32_t i = 1; i <= iDayNum; i += 7) {
     iTemp++;
-    iWeekNum = CalWeekNumber(m_iCurYear, iMonthNum, i);
     m_rtWeekNum.Set(fHStartPos, fVStartPos + m_fDateCellHei * iTemp,
                     m_fWeekNumWid, m_fDateCellHei);
-    wsWeekNum.Format(L"%d", iWeekNum);
+    wsWeekNum.Format(L"0");
     params.m_wsText = wsWeekNum;
     params.m_rtPart = m_rtWeekNum;
     pTheme->DrawText(&params);
   }
 }
 
 void IFWL_MonthCalendar::DrawWeekNumberSep(CFX_Graphics* pGraphics,
                                            IFWL_ThemeProvider* pTheme,
                                            const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
@@ skipping 96 matching lines @@
   params.m_iPart = CFWL_Part::DateInCircle;
   params.m_pGraphics = pGraphics;
   params.m_rtPart = pDate->rect;
   params.m_dwStates = CFWL_PartState_Normal;
   if (pMatrix) {
     params.m_matrix.Concat(*pMatrix);
   }
   pTheme->DrawBackground(&params);
 }
 
-void IFWL_MonthCalendar::DrawTodayCircle(CFX_Graphics* pGraphics,
-                                         IFWL_ThemeProvider* pTheme,
-                                         const CFX_Matrix* pMatrix) {
-  if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_NoToday) {
-    return;
-  }
-  if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_NoTodayCircle) {
-    return;
-  }
-  CFWL_ThemeBackground params;
-  params.m_pWidget = this;
-  params.m_iPart = CFWL_Part::TodayCircle;
-  params.m_pGraphics = pGraphics;
-  params.m_dwStates = CFWL_PartState_Normal;
-  params.m_rtPart = m_rtTodayFlag;
-  if (pMatrix) {
-    params.m_matrix.Concat(*pMatrix);
-  }
-  pTheme->DrawBackground(&params);
-}
-
 CFX_SizeF IFWL_MonthCalendar::CalcSize(bool bAutoSize) {
   if (!m_pProperties->m_pThemeProvider)
     return CFX_SizeF();
 
   if (!bAutoSize) {
     GetClientRect(m_rtClient);
     return CFX_SizeF(m_rtClient.width, m_rtClient.height);
   }
 
   CFX_SizeF fs;
@@ skipping 67 matching lines @@
       m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN + MONTHCAL_HMARGIN,
       m_rtDates.bottom() + MONTHCAL_HEADER_BTN_VMARGIN + MONTHCAL_VMARGIN,
       m_szCell.x, m_szToday.y);
   m_rtToday.Set(
       m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN + m_szCell.x +
           MONTHCAL_HMARGIN * 2,
       m_rtDates.bottom() + MONTHCAL_HEADER_BTN_VMARGIN + MONTHCAL_VMARGIN,
       m_szToday.x, m_szToday.y);
 }
 
-void IFWL_MonthCalendar::LayOut() {
+void IFWL_MonthCalendar::Layout() {
   GetClientRect(m_rtClient);
   {
     m_rtHead.Set(
         m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN, m_rtClient.top,
         m_rtClient.width - MONTHCAL_HEADER_BTN_HMARGIN * 2,
         m_szCell.x + (MONTHCAL_HEADER_BTN_VMARGIN + MONTHCAL_VMARGIN) * 2);
     m_rtWeek.Set(m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN,
                  m_rtHead.bottom(),
                  m_rtClient.width - MONTHCAL_HEADER_BTN_HMARGIN * 2,
                  m_szCell.y + MONTHCAL_VMARGIN * 2);
@@ skipping 101 matching lines @@
       pTheme->GetCapacity(&part, CFWL_WidgetCapacity::TodayFlagWidth));
   m_fMCWid = *static_cast<FX_FLOAT*>(
       pTheme->GetCapacity(&part, CFWL_WidgetCapacity::Width));
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_WeekNumbers) {
     m_fMCWid += m_fWeekNumWid;
   }
   m_fMCHei = *static_cast<FX_FLOAT*>(
       pTheme->GetCapacity(&part, CFWL_WidgetCapacity::Height));
 }
 
-int32_t IFWL_MonthCalendar::CalWeekNumber(int32_t iYear,
-                                          int32_t iMonth,
-                                          int32_t iDay) {
-  return 0;
-}
-
-bool IFWL_MonthCalendar::GetMinDate(int32_t& iYear,
-                                    int32_t& iMonth,
-                                    int32_t& iDay) {
-  iYear = m_dtMin.iYear;
-  iMonth = m_dtMin.iMonth;
-  iDay = m_dtMin.iDay;
-  return true;
-}
-
-bool IFWL_MonthCalendar::SetMinDate(int32_t iYear,
-                                    int32_t iMonth,
-                                    int32_t iDay) {
-  m_dtMin = DATE(iYear, iMonth, iDay);
-  return true;
-}
-
-bool IFWL_MonthCalendar::GetMaxDate(int32_t& iYear,
-                                    int32_t& iMonth,
-                                    int32_t& iDay) {
-  iYear = m_dtMax.iYear;
-  iMonth = m_dtMax.iMonth;
-  iDay = m_dtMax.iDay;
-  return true;
-}
-
-bool IFWL_MonthCalendar::SetMaxDate(int32_t iYear,
-                                    int32_t iMonth,
-                                    int32_t iDay) {
-  m_dtMax = DATE(iYear, iMonth, iDay);
-  return true;
-}
-
-bool IFWL_MonthCalendar::InitDate() {
+void IFWL_MonthCalendar::InitDate() {
   if (m_pProperties->m_pDataProvider) {
     IFWL_MonthCalendarDP* pDateProv =
         static_cast<IFWL_MonthCalendarDP*>(m_pProperties->m_pDataProvider);
     m_iYear = pDateProv->GetCurYear(this);
     m_iMonth = pDateProv->GetCurMonth(this);
     m_iDay = pDateProv->GetCurDay(this);
     m_iCurYear = m_iYear;
     m_iCurMonth = m_iMonth;
   } else {
     m_iDay = 1;
     m_iMonth = 1;
     m_iYear = 1;
     m_iCurYear = m_iYear;
     m_iCurMonth = m_iMonth;
   }
   GetTodayText(m_iYear, m_iMonth, m_iDay, m_wsToday);
   GetHeadText(m_iCurYear, m_iCurMonth, m_wsHead);
   m_dtMin = DATE(1500, 12, 1);
   m_dtMax = DATE(2200, 1, 1);
-  return true;
 }
 
 void IFWL_MonthCalendar::ClearDateItem() {
   for (int32_t i = 0; i < m_arrDates.GetSize(); i++)
     delete m_arrDates.GetAt(i);
 
   m_arrDates.RemoveAll();
 }
 
-void IFWL_MonthCalendar::ReSetDateItem() {
+void IFWL_MonthCalendar::ResetDateItem() {
   m_pDateTime->Set(m_iCurYear, m_iCurMonth, 1);
   int32_t iDays = FX_DaysInMonth(m_iCurYear, m_iCurMonth);
   int32_t iDayOfWeek = m_pDateTime->GetDayOfWeek();
   for (int32_t i = 0; i < iDays; i++) {
     if (iDayOfWeek >= 7) {
       iDayOfWeek = 0;
     }
     CFX_WideString wsDay;
     wsDay.Format(L"%d", i + 1);
     uint32_t dwStates = 0;
     if (m_iYear == m_iCurYear && m_iMonth == m_iCurMonth && m_iDay == (i + 1)) {
       dwStates |= FWL_ITEMSTATE_MCD_Flag;
     }
     if (m_arrSelDays.Find(i + 1) != -1) {
       dwStates |= FWL_ITEMSTATE_MCD_Selected;
     }
     CFX_RectF rtDate;
     rtDate.Set(0, 0, 0, 0);
     m_arrDates.Add(
         new FWL_DATEINFO(i + 1, iDayOfWeek, dwStates, rtDate, wsDay));
     iDayOfWeek++;
   }
 }
 
-bool IFWL_MonthCalendar::NextMonth() {
+void IFWL_MonthCalendar::NextMonth() {
   int32_t iYear = m_iCurYear, iMonth = m_iCurMonth;
   if (iMonth >= 12) {
     iMonth = 1;
     iYear++;
   } else {
     iMonth++;
   }
   DATE dt(m_iCurYear, m_iCurMonth, 1);
   if (!(dt < m_dtMax)) {
-    return false;
+    return;
   }
   m_iCurYear = iYear, m_iCurMonth = iMonth;
   ChangeToMonth(m_iCurYear, m_iCurMonth);
-  return true;
 }
 
-bool IFWL_MonthCalendar::PrevMonth() {
+void IFWL_MonthCalendar::PrevMonth() {
   int32_t iYear = m_iCurYear, iMonth = m_iCurMonth;
   if (iMonth <= 1) {
     iMonth = 12;
     iYear--;
   } else {
     iMonth--;
   }
   DATE dt(m_iCurYear, m_iCurMonth, 1);
   if (!(dt > m_dtMin)) {
-    return false;
+    return;
   }
   m_iCurYear = iYear, m_iCurMonth = iMonth;
   ChangeToMonth(m_iCurYear, m_iCurMonth);
-  return true;
 }
 
 void IFWL_MonthCalendar::ChangeToMonth(int32_t iYear, int32_t iMonth) {
   m_iCurYear = iYear;
   m_iCurMonth = iMonth;
   m_iHovered = -1;
   ClearDateItem();
-  ReSetDateItem();
+  ResetDateItem();
   CalDateItem();
   GetHeadText(m_iCurYear, m_iCurMonth, m_wsHead);
 }
 
-bool IFWL_MonthCalendar::RemoveSelDay(int32_t iDay, bool bAll) {
+void IFWL_MonthCalendar::RemoveSelDay(int32_t iDay, bool bAll) {
   if (iDay == -1 && !bAll) {
-    return false;
+    return;
   }
   if (bAll) {
     int32_t iCount = m_arrSelDays.GetSize();
     int32_t iDatesCount = m_arrDates.GetSize();
     for (int32_t i = 0; i < iCount; i++) {
       int32_t iSelDay = m_arrSelDays.GetAt(i);
       if (iSelDay <= iDatesCount) {
         FWL_DATEINFO* pDateInfo = m_arrDates.GetAt(iSelDay - 1);
         pDateInfo->dwStates &= ~FWL_ITEMSTATE_MCD_Selected;
       }
     }
     m_arrSelDays.RemoveAll();
   } else {
     int32_t index = m_arrSelDays.Find(iDay);
     if (index == -1) {
-      return false;
+      return;
     }
     int32_t iSelDay = m_arrSelDays.GetAt(iDay);
     int32_t iDatesCount = m_arrDates.GetSize();
     if (iSelDay <= iDatesCount) {
       FWL_DATEINFO* pDateInfo = m_arrDates.GetAt(iSelDay - 1);
       pDateInfo->dwStates &= ~FWL_ITEMSTATE_MCD_Selected;
     }
     m_arrSelDays.RemoveAt(index);
   }
-  return true;
 }
 
-bool IFWL_MonthCalendar::AddSelDay(int32_t iDay) {
+void IFWL_MonthCalendar::AddSelDay(int32_t iDay) {
   ASSERT(iDay > 0);
-  if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_MultiSelect) {
-  } else {
-    if (m_arrSelDays.Find(iDay) == -1) {
-      RemoveSelDay(-1, true);
-      if (iDay <= m_arrDates.GetSize()) {
-        FWL_DATEINFO* pDateInfo = m_arrDates.GetAt(iDay - 1);
-        pDateInfo->dwStates |= FWL_ITEMSTATE_MCD_Selected;
-      }
-      m_arrSelDays.Add(iDay);
+  if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_MultiSelect)
+    return;
+
+  if (m_arrSelDays.Find(iDay) == -1) {
+    RemoveSelDay(-1, true);
+    if (iDay <= m_arrDates.GetSize()) {
+      FWL_DATEINFO* pDateInfo = m_arrDates.GetAt(iDay - 1);
+      pDateInfo->dwStates |= FWL_ITEMSTATE_MCD_Selected;
     }
+    m_arrSelDays.Add(iDay);
   }
-  return true;
 }
 
-bool IFWL_MonthCalendar::JumpToToday() {
+void IFWL_MonthCalendar::JumpToToday() {
   if (m_iYear != m_iCurYear || m_iMonth != m_iCurMonth) {
     m_iCurYear = m_iYear;
     m_iCurMonth = m_iMonth;
     ChangeToMonth(m_iYear, m_iMonth);
     AddSelDay(m_iDay);
   } else {
     if (m_arrSelDays.Find(m_iDay) == -1) {
       AddSelDay(m_iDay);
     }
   }
-  return true;
 }
 
 void IFWL_MonthCalendar::GetHeadText(int32_t iYear,
                                      int32_t iMonth,
                                      CFX_WideString& wsHead) {
   ASSERT(iMonth > 0 && iMonth < 13);
   static const FX_WCHAR* const pMonth[] = {
       L"January",   L"February", L"March",    L"April",
       L"May",       L"June",     L"July",     L"August",
       L"September", L"October",  L"November", L"December"};
@@ skipping 11 matching lines @@
   int32_t iCount = m_arrDates.GetSize();
   for (int32_t i = 0; i < iCount; i++) {
     FWL_DATEINFO* pDateInfo = m_arrDates.GetAt(i);
     if (pDateInfo->rect.Contains(x, y)) {
       return ++i;
     }
   }
   return -1;
 }
 
-bool IFWL_MonthCalendar::GetDayRect(int32_t iDay, CFX_RectF& rtDay) {
+void IFWL_MonthCalendar::GetDayRect(int32_t iDay, CFX_RectF& rtDay) {
   if (iDay <= 0 || iDay > m_arrDates.GetSize()) {

[Tom Sepez, 2016/11/09 21:13:11]

nit: no {}

[dsinclair, 2016/11/10 18:04:16]

Done.

-    return false;
+    return;
   }
   FWL_DATEINFO* pDateInfo = m_arrDates[iDay - 1];
   if (!pDateInfo)
-    return false;
+    return;
   rtDay = pDateInfo->rect;
-  return true;
 }
 
 void IFWL_MonthCalendar::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
   CFWL_MessageType dwMsgCode = pMessage->GetClassID();
   switch (dwMsgCode) {
     case CFWL_MessageType::SetFocus:
     case CFWL_MessageType::KillFocus:
@@ skipping 183 matching lines @@
                            uint32_t dwSt,
                            CFX_RectF rc,
                            CFX_WideString& wsday)
     : iDay(day),
       iDayOfWeek(dayofweek),
       dwStates(dwSt),
       rect(rc),
       wsDay(wsday) {}
 
 FWL_DATEINFO::~FWL_DATEINFO() {}