Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1874)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: xfa/src/fwl/src/lightwidget/combobox.cpp

Issue 1508883003: Replace more static casts in FWL (part 3) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Remove Transfer() default args since they're always present. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/src/fwl/src/lightwidget/checkbox.cpp ('k') | xfa/src/fwl/src/lightwidget/datetimepicker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/src/fwl/src/lightwidget/combobox.cpp
diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp
index bff783ea49770ad5ffc20965043d8bd1616392f1..556601f32fba4e0fd11a11f02d4b23f0d34cb83b 100644
--- a/xfa/src/fwl/src/lightwidget/combobox.cpp
+++ b/xfa/src/fwl/src/lightwidget/combobox.cpp
@@ -49,8 +49,8 @@ int32_t CFWL_ComboBox::CountItems() {
return m_comboBoxData.CountItems(GetWidget());
}
FWL_ERR CFWL_ComboBox::GetTextByIndex(int32_t iIndex, CFX_WideString& wsText) {
- CFWL_ComboBoxItem* pItem =
- (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget*)this, iIndex));
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(
+ m_comboBoxData.GetItem(m_pIface, iIndex));
if (!pItem)
return FWL_ERR_Indefinite;
wsText = pItem->m_wsText;
@@ -59,168 +59,170 @@ FWL_ERR CFWL_ComboBox::GetTextByIndex(int32_t iIndex, CFX_WideString& wsText) {
int32_t CFWL_ComboBox::GetCurSel() {
if (!m_pIface)
return -1;
- return ((IFWL_ComboBox*)m_pIface)->GetCurSel();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->GetCurSel();
}
FWL_ERR CFWL_ComboBox::SetCurSel(int32_t iSel) {
if (!m_pIface)
return FWL_ERR_Indefinite;
- return ((IFWL_ComboBox*)m_pIface)->SetCurSel(iSel);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->SetCurSel(iSel);
}
FWL_ERR CFWL_ComboBox::SetEditText(const CFX_WideStringC& wsText) {
if (!m_pIface)
return FWL_ERR_Indefinite;
- return ((IFWL_ComboBox*)m_pIface)->SetEditText(wsText);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->SetEditText(wsText);
}
int32_t CFWL_ComboBox::GetEditTextLength() const {
if (!m_pIface)
return 0;
- return ((IFWL_ComboBox*)m_pIface)->GetEditTextLength();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->GetEditTextLength();
}
FWL_ERR CFWL_ComboBox::GetEditText(CFX_WideString& wsText,
int32_t nStart,
int32_t nCount) const {
if (!m_pIface)
return FWL_ERR_Indefinite;
- return ((IFWL_ComboBox*)m_pIface)->GetEditText(wsText, nStart, nCount);
+ return static_cast<IFWL_ComboBox*>(m_pIface)
+ ->GetEditText(wsText, nStart, nCount);
}
FWL_ERR CFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount) {
if (!m_pIface)
return FWL_ERR_Indefinite;
- return ((IFWL_ComboBox*)m_pIface)->SetEditSelRange(nStart, nCount);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->SetEditSelRange(nStart, nCount);
}
int32_t CFWL_ComboBox::GetEditSelRange(int32_t nIndex, int32_t& nStart) {
if (!m_pIface)
return 0;
- return ((IFWL_ComboBox*)m_pIface)->GetEditSelRange(nIndex, nStart);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->GetEditSelRange(nIndex, nStart);
}
int32_t CFWL_ComboBox::GetEditLimit() {
if (!m_pIface)
return 0;
- return ((IFWL_ComboBox*)m_pIface)->GetEditLimit();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->GetEditLimit();
}
FWL_ERR CFWL_ComboBox::SetEditLimit(int32_t nLimit) {
if (!m_pIface)
return FWL_ERR_Indefinite;
- return ((IFWL_ComboBox*)m_pIface)->SetEditLimit(nLimit);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->SetEditLimit(nLimit);
}
FWL_ERR CFWL_ComboBox::EditDoClipboard(int32_t iCmd) {
if (!m_pIface)
return FWL_ERR_Indefinite;
- return ((IFWL_ComboBox*)m_pIface)->EditDoClipboard(iCmd);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditDoClipboard(iCmd);
}
FX_BOOL CFWL_ComboBox::EditRedo(const CFX_ByteStringC& bsRecord) {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditRedo(bsRecord);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditRedo(bsRecord);
}
FX_BOOL CFWL_ComboBox::EditUndo(const CFX_ByteStringC& bsRecord) {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditUndo(bsRecord);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditUndo(bsRecord);
}
FWL_ERR CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight) {
m_comboBoxData.m_fMaxListHeight = fMaxHeight;
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData) {
- CFWL_ComboBoxItem* pItem =
- (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget*)this, iIndex));
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(
+ m_comboBoxData.GetItem(m_pIface, iIndex));
if (!pItem)
return FWL_ERR_Indefinite;
pItem->m_pData = pData;
return FWL_ERR_Succeeded;
}
void* CFWL_ComboBox::GetItemData(int32_t iIndex) {
- CFWL_ComboBoxItem* pItem =
- (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget*)this, iIndex));
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(
+ m_comboBoxData.GetItem(m_pIface, iIndex));
if (!pItem)
return NULL;
return pItem->m_pData;
}
FWL_ERR CFWL_ComboBox::SetListTheme(IFWL_ThemeProvider* pTheme) {
- return ((IFWL_ComboBox*)m_pIface)->GetListBoxt()->SetThemeProvider(pTheme);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->GetListBoxt()->SetThemeProvider(
+ pTheme);
}
FX_BOOL CFWL_ComboBox::AfterFocusShowDropList() {
- return ((IFWL_ComboBox*)m_pIface)->AfterFocusShowDropList();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->AfterFocusShowDropList();
}
FWL_ERR CFWL_ComboBox::OpenDropDownList(FX_BOOL bActivate) {
- return ((IFWL_ComboBox*)m_pIface)->OpenDropDownList(bActivate);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->OpenDropDownList(bActivate);
}
FX_BOOL CFWL_ComboBox::EditCanUndo() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditCanUndo();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanUndo();
}
FX_BOOL CFWL_ComboBox::EditCanRedo() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditCanRedo();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanRedo();
}
FX_BOOL CFWL_ComboBox::EditUndo() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditUndo();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditUndo();
}
FX_BOOL CFWL_ComboBox::EditRedo() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditRedo();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditRedo();
}
FX_BOOL CFWL_ComboBox::EditCanCopy() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditCanCopy();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanCopy();
}
FX_BOOL CFWL_ComboBox::EditCanCut() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditCanCut();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanCut();
}
FX_BOOL CFWL_ComboBox::EditCanSelectAll() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditCanSelectAll();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanSelectAll();
}
FX_BOOL CFWL_ComboBox::EditCopy(CFX_WideString& wsCopy) {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditCopy(wsCopy);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditCopy(wsCopy);
}
FX_BOOL CFWL_ComboBox::EditCut(CFX_WideString& wsCut) {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditCut(wsCut);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditCut(wsCut);
}
FX_BOOL CFWL_ComboBox::EditPaste(const CFX_WideString& wsPaste) {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditPaste(wsPaste);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditPaste(wsPaste);
}
FX_BOOL CFWL_ComboBox::EditSelectAll() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditSelectAll();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditSelectAll();
}
FX_BOOL CFWL_ComboBox::EditDelete() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditDelete();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditDelete();
}
FX_BOOL CFWL_ComboBox::EditDeSelect() {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->EditDeSelect();
+ return static_cast<IFWL_ComboBox*>(m_pIface)->EditDeSelect();
}
FWL_ERR CFWL_ComboBox::GetBBox(CFX_RectF& rect) {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)->GetBBox(rect);
+ return static_cast<IFWL_ComboBox*>(m_pIface)->GetBBox(rect);
}
FWL_ERR CFWL_ComboBox::EditModifyStylesEx(FX_DWORD dwStylesExAdded,
FX_DWORD dwStylesExRemoved) {
if (!m_pIface)
return FALSE;
- return ((IFWL_ComboBox*)m_pIface)
+ return static_cast<IFWL_ComboBox*>(m_pIface)
->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
CFWL_ComboBox::CFWL_ComboBox() {}
@@ -232,10 +234,7 @@ CFWL_ComboBox::CFWL_ComboBoxDP::CFWL_ComboBoxDP() {
CFWL_ComboBox::CFWL_ComboBoxDP::~CFWL_ComboBoxDP() {
int32_t nCount = m_arrItem.GetSize();
for (int32_t i = 0; i < nCount; i++) {
- CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)m_arrItem[i];
- if (pItem) {
- delete pItem;
- }
+ delete static_cast<CFWL_ComboBoxItem*>(m_arrItem[i]);
}
m_arrItem.RemoveAll();
}
@@ -263,14 +262,14 @@ FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemStyles(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem) {
if (!hItem)
return 0;
- return ((CFWL_ComboBoxItem*)hItem)->m_dwStyles;
+ return reinterpret_cast<CFWL_ComboBoxItem*>(hItem)->m_dwStyles;
}
FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemText(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
CFX_WideString& wsText) {
if (!hItem)
return FWL_ERR_Indefinite;
- wsText = ((CFWL_ComboBoxItem*)hItem)->m_wsText;
+ wsText = reinterpret_cast<CFWL_ComboBoxItem*>(hItem)->m_wsText;
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemRect(IFWL_Widget* pWidget,
@@ -278,7 +277,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemRect(IFWL_Widget* pWidget,
CFX_RectF& rtItem) {
if (!hItem)
return FWL_ERR_Indefinite;
- CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(hItem);
rtItem.Set(pItem->m_rtItem.left, pItem->m_rtItem.top, pItem->m_rtItem.width,
pItem->m_rtItem.height);
return FWL_ERR_Succeeded;
@@ -287,7 +286,7 @@ void* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem) {
if (!hItem)
return NULL;
- CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(hItem);
return pItem->m_pData;
}
FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemStyles(IFWL_Widget* pWidget,
@@ -295,7 +294,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemStyles(IFWL_Widget* pWidget,
FX_DWORD dwStyle) {
if (!hItem)
return FWL_ERR_Indefinite;
- ((CFWL_ComboBoxItem*)hItem)->m_dwStyles = dwStyle;
+ reinterpret_cast<CFWL_ComboBoxItem*>(hItem)->m_dwStyles = dwStyle;
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget* pWidget,
@@ -303,7 +302,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget* pWidget,
const FX_WCHAR* pszText) {
if (!hItem)
return FWL_ERR_Indefinite;
- ((CFWL_ComboBoxItem*)hItem)->m_wsText = pszText;
+ reinterpret_cast<CFWL_ComboBoxItem*>(hItem)->m_wsText = pszText;
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemRect(IFWL_Widget* pWidget,
@@ -311,7 +310,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemRect(IFWL_Widget* pWidget,
const CFX_RectF& rtItem) {
if (!hItem)
return FWL_ERR_Indefinite;
- ((CFWL_ComboBoxItem*)hItem)->m_rtItem = rtItem;
+ reinterpret_cast<CFWL_ComboBoxItem*>(hItem)->m_rtItem = rtItem;
return FWL_ERR_Succeeded;
}
FX_FLOAT CFWL_ComboBox::CFWL_ComboBoxDP::GetItemHeight(IFWL_Widget* pWidget) {
@@ -321,12 +320,12 @@ CFX_DIBitmap* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemIcon(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem) {
if (!hItem)
return NULL;
- return ((CFWL_ComboBoxItem*)hItem)->m_pDIB;
+ return reinterpret_cast<CFWL_ComboBoxItem*>(hItem)->m_pDIB;
}
FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckRect(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
CFX_RectF& rtCheck) {
- CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(hItem);
rtCheck = pItem->m_rtCheckBox;
return FWL_ERR_Succeeded;
}
@@ -334,21 +333,21 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemCheckRect(
IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
const CFX_RectF& rtCheck) {
- CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(hItem);
pItem->m_rtCheckBox = rtCheck;
return FWL_ERR_Succeeded;
}
FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckState(
IFWL_Widget* pWidget,
FWL_HLISTITEM hItem) {
- CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(hItem);
return pItem->m_dwCheckState;
}
FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemCheckState(
IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
FX_DWORD dwCheckState) {
- CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;
+ CFWL_ComboBoxItem* pItem = reinterpret_cast<CFWL_ComboBoxItem*>(hItem);
pItem->m_dwCheckState = dwCheckState;
return FWL_ERR_Succeeded;
}
« no previous file with comments | « xfa/src/fwl/src/lightwidget/checkbox.cpp ('k') | xfa/src/fwl/src/lightwidget/datetimepicker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698