Change some XFA enums to follow the style guide.
Change FWL_KeyCommand into CFWL_MessageKey::Type in the process.
Bug: pdfium:547
Change-Id: I0a9d28a8f7a0f2a35f09a61ec72e6cea9a3a5bfe
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70740
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fde/cfde_texteditengine.cpp b/xfa/fde/cfde_texteditengine.cpp
index 511fc50..292a89f 100644
--- a/xfa/fde/cfde_texteditengine.cpp
+++ b/xfa/fde/cfde_texteditengine.cpp
@@ -1069,7 +1069,7 @@
}
void CFDE_TextEditEngine::RebuildPieces() {
- text_break_.EndBreak(CFX_BreakType::Paragraph);
+ text_break_.EndBreak(CFX_BreakType::kParagraph);
text_break_.ClearBreakPieces();
char_widths_.clear();
@@ -1091,7 +1091,7 @@
CFX_BreakType break_status = text_break_.AppendChar(
password_mode_ ? password_alias_ : iter->GetChar());
if (iter->IsEOF(false) && CFX_BreakTypeNoneOrPiece(break_status))
- break_status = text_break_.EndBreak(CFX_BreakType::Paragraph);
+ break_status = text_break_.EndBreak(CFX_BreakType::kParagraph);
if (CFX_BreakTypeNoneOrPiece(break_status))
continue;
diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp
index c54973d..ef1df9b 100644
--- a/xfa/fde/cfde_textout.cpp
+++ b/xfa/fde/cfde_textout.cpp
@@ -210,7 +210,7 @@
float fWidth = 0.0f;
float fHeight = 0.0f;
float fStartPos = pRect->right();
- CFX_BreakType dwBreakStatus = CFX_BreakType::None;
+ CFX_BreakType dwBreakStatus = CFX_BreakType::kNone;
bool break_char_is_set = false;
for (const wchar_t& wch : str) {
if (!break_char_is_set && (wch == L'\n' || wch == L'\r')) {
@@ -222,7 +222,7 @@
RetrieveLineWidth(dwBreakStatus, &fStartPos, &fWidth, &fHeight);
}
- dwBreakStatus = m_pTxtBreak->EndBreak(CFX_BreakType::Paragraph);
+ dwBreakStatus = m_pTxtBreak->EndBreak(CFX_BreakType::kParagraph);
if (!CFX_BreakTypeNoneOrPiece(dwBreakStatus))
RetrieveLineWidth(dwBreakStatus, &fStartPos, &fWidth, &fHeight);
@@ -258,9 +258,9 @@
}
m_pTxtBreak->ClearBreakPieces();
- if (dwBreakStatus == CFX_BreakType::Paragraph)
+ if (dwBreakStatus == CFX_BreakType::kParagraph)
m_pTxtBreak->Reset();
- if (!m_Styles.line_wrap_ && dwBreakStatus == CFX_BreakType::Line) {
+ if (!m_Styles.line_wrap_ && dwBreakStatus == CFX_BreakType::kLine) {
*pWidth += fLineWidth;
} else {
*pWidth = std::max(*pWidth, fLineWidth);
@@ -336,8 +336,8 @@
bool bEndofLine =
RetrievePieces(dwBreakStatus, false, rect, &start_char, &iPieceWidths);
if (bEndofLine &&
- (m_Styles.line_wrap_ || dwBreakStatus == CFX_BreakType::Paragraph ||
- dwBreakStatus == CFX_BreakType::Page)) {
+ (m_Styles.line_wrap_ || dwBreakStatus == CFX_BreakType::kParagraph ||
+ dwBreakStatus == CFX_BreakType::kPage)) {
iPieceWidths = 0;
++m_iCurLine;
m_fLinePos += fLineStep;
@@ -350,7 +350,7 @@
}
}
- dwBreakStatus = m_pTxtBreak->EndBreak(CFX_BreakType::Paragraph);
+ dwBreakStatus = m_pTxtBreak->EndBreak(CFX_BreakType::kParagraph);
if (!CFX_BreakTypeNoneOrPiece(dwBreakStatus) && !bRet)
RetrievePieces(dwBreakStatus, false, rect, &start_char, &iPieceWidths);
@@ -408,7 +408,7 @@
m_pTxtBreak->ClearBreakPieces();
return m_Styles.single_line_ || m_Styles.line_wrap_ || bNeedReload ||
- dwBreakStatus == CFX_BreakType::Paragraph;
+ dwBreakStatus == CFX_BreakType::kParagraph;
}
void CFDE_TextOut::AppendPiece(const Piece& piece,
@@ -455,7 +455,7 @@
const Piece* pPiece = pLine->GetPieceAtIndex(0);
size_t start_char = pPiece->start_char;
int32_t iPieceWidths = 0;
- CFX_BreakType dwBreakStatus = CFX_BreakType::None;
+ CFX_BreakType dwBreakStatus = CFX_BreakType::kNone;
m_fLinePos = pPiece->bounds.top;
while (iPieceIndex < iPieceCount) {
size_t start = start_char;
@@ -471,7 +471,7 @@
pPiece = pLine->GetPieceAtIndex(iPieceIndex);
}
- dwBreakStatus = m_pTxtBreak->EndBreak(CFX_BreakType::Paragraph);
+ dwBreakStatus = m_pTxtBreak->EndBreak(CFX_BreakType::kParagraph);
if (!CFX_BreakTypeNoneOrPiece(dwBreakStatus))
RetrievePieces(dwBreakStatus, true, rect, &start_char, &iPieceWidths);
diff --git a/xfa/fgas/layout/cfx_break.cpp b/xfa/fgas/layout/cfx_break.cpp
index 6330a51..2532725 100644
--- a/xfa/fgas/layout/cfx_break.cpp
+++ b/xfa/fgas/layout/cfx_break.cpp
@@ -75,8 +75,8 @@
return;
CFX_Char* tc = m_pCurLine->GetChar(m_pCurLine->m_LineChars.size() - 1);
- if (tc->m_dwStatus == CFX_BreakType::None)
- tc->m_dwStatus = CFX_BreakType::Piece;
+ if (tc->m_dwStatus == CFX_BreakType::kNone)
+ tc->m_dwStatus = CFX_BreakType::kPiece;
}
bool CFX_Break::IsGreaterThanLineWidth(int32_t width) const {
diff --git a/xfa/fgas/layout/cfx_breakpiece.h b/xfa/fgas/layout/cfx_breakpiece.h
index febb16c..a708bf1 100644
--- a/xfa/fgas/layout/cfx_breakpiece.h
+++ b/xfa/fgas/layout/cfx_breakpiece.h
@@ -29,7 +29,7 @@
WideString GetString() const;
std::vector<int32_t> GetWidths() const;
- CFX_BreakType m_dwStatus = CFX_BreakType::Piece;
+ CFX_BreakType m_dwStatus = CFX_BreakType::kPiece;
int32_t m_iStartPos = 0;
int32_t m_iWidth = -1;
int32_t m_iStartChar = 0;
diff --git a/xfa/fgas/layout/cfx_char.h b/xfa/fgas/layout/cfx_char.h
index c4bafcc..deca8e9 100644
--- a/xfa/fgas/layout/cfx_char.h
+++ b/xfa/fgas/layout/cfx_char.h
@@ -16,7 +16,13 @@
#include "xfa/fgas/layout/cfx_textuserdata.h"
#include "xfa/fgas/layout/fx_linebreak.h"
-enum class CFX_BreakType : uint8_t { None = 0, Piece, Line, Paragraph, Page };
+enum class CFX_BreakType : uint8_t {
+ kNone = 0,
+ kPiece,
+ kLine,
+ kParagraph,
+ kPage
+};
class CFX_Char {
public:
@@ -35,7 +41,7 @@
int16_t horizonal_scale() const { return m_iHorizontalScale; }
int16_t vertical_scale() const { return m_iVerticalScale; }
- CFX_BreakType m_dwStatus = CFX_BreakType::None;
+ CFX_BreakType m_dwStatus = CFX_BreakType::kNone;
FX_BIDICLASS m_iBidiClass = FX_BIDICLASS::kON;
FX_LINEBREAKTYPE m_eLineBreakType = FX_LINEBREAKTYPE::kUNKNOWN;
uint32_t m_dwCharStyles = 0;
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp
index 0f7ab62..05724d3 100644
--- a/xfa/fgas/layout/cfx_rtfbreak.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak.cpp
@@ -76,19 +76,19 @@
pCurChar->m_dwIdentity = m_dwIdentity;
pCurChar->m_pUserData = m_pUserData;
- CFX_BreakType dwRet1 = CFX_BreakType::None;
+ CFX_BreakType dwRet1 = CFX_BreakType::kNone;
if (chartype != FX_CHARTYPE::kCombination &&
GetUnifiedCharType(m_eCharType) != GetUnifiedCharType(chartype) &&
m_eCharType != FX_CHARTYPE::kUnknown &&
IsGreaterThanLineWidth(m_pCurLine->GetLineEnd()) &&
(m_eCharType != FX_CHARTYPE::kSpace ||
chartype != FX_CHARTYPE::kControl)) {
- dwRet1 = EndBreak(CFX_BreakType::Line);
+ dwRet1 = EndBreak(CFX_BreakType::kLine);
if (!m_pCurLine->m_LineChars.empty())
pCurChar = &m_pCurLine->m_LineChars.back();
}
- CFX_BreakType dwRet2 = CFX_BreakType::None;
+ CFX_BreakType dwRet2 = CFX_BreakType::kNone;
switch (chartype) {
case FX_CHARTYPE::kTab:
AppendChar_Tab(pCurChar);
@@ -171,24 +171,24 @@
}
CFX_BreakType CFX_RTFBreak::AppendChar_Control(CFX_Char* pCurChar) {
- CFX_BreakType dwRet2 = CFX_BreakType::None;
+ CFX_BreakType dwRet2 = CFX_BreakType::kNone;
switch (pCurChar->char_code()) {
case L'\v':
case 0x2028:
- dwRet2 = CFX_BreakType::Line;
+ dwRet2 = CFX_BreakType::kLine;
break;
case L'\f':
- dwRet2 = CFX_BreakType::Page;
+ dwRet2 = CFX_BreakType::kPage;
break;
case 0x2029:
- dwRet2 = CFX_BreakType::Paragraph;
+ dwRet2 = CFX_BreakType::kParagraph;
break;
default:
if (pCurChar->char_code() == m_wParagraphBreakChar)
- dwRet2 = CFX_BreakType::Paragraph;
+ dwRet2 = CFX_BreakType::kParagraph;
break;
}
- if (dwRet2 != CFX_BreakType::None)
+ if (dwRet2 != CFX_BreakType::kNone)
dwRet2 = EndBreak(dwRet2);
return dwRet2;
@@ -229,7 +229,7 @@
FX_SAFE_INT32 checked_width = m_pCurLine->m_iWidth;
checked_width += iCharWidthValid;
if (!checked_width.IsValid())
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
m_pCurLine->m_iWidth = checked_width.ValueOrDie();
iCharWidth = 0;
@@ -258,13 +258,13 @@
FX_SAFE_INT32 checked_width = m_pCurLine->m_iWidth;
checked_width += iCharWidthValid;
if (!checked_width.IsValid())
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
m_pCurLine->m_iWidth = checked_width.ValueOrDie();
if (IsGreaterThanLineWidth(m_pCurLine->GetLineEnd()))
- return EndBreak(CFX_BreakType::Line);
- return CFX_BreakType::None;
+ return EndBreak(CFX_BreakType::kLine);
+ return CFX_BreakType::kNone;
}
CFX_BreakType CFX_RTFBreak::AppendChar_Others(CFX_Char* pCurChar) {
@@ -288,41 +288,41 @@
FX_SAFE_INT32 checked_width = m_pCurLine->m_iWidth;
checked_width += iCharWidthValid;
if (!checked_width.IsValid())
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
m_pCurLine->m_iWidth = checked_width.ValueOrDie();
if (chartype != FX_CHARTYPE::kSpace &&
IsGreaterThanLineWidth(m_pCurLine->GetLineEnd())) {
- return EndBreak(CFX_BreakType::Line);
+ return EndBreak(CFX_BreakType::kLine);
}
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
}
CFX_BreakType CFX_RTFBreak::EndBreak(CFX_BreakType dwStatus) {
- ASSERT(dwStatus != CFX_BreakType::None);
+ ASSERT(dwStatus != CFX_BreakType::kNone);
++m_dwIdentity;
if (!m_pCurLine->m_LinePieces.empty()) {
- if (dwStatus != CFX_BreakType::Piece)
+ if (dwStatus != CFX_BreakType::kPiece)
m_pCurLine->m_LinePieces.back().m_dwStatus = dwStatus;
return m_pCurLine->m_LinePieces.back().m_dwStatus;
}
if (HasLine()) {
if (m_Lines[m_iReadyLineIndex].m_LinePieces.empty())
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
- if (dwStatus != CFX_BreakType::Piece)
+ if (dwStatus != CFX_BreakType::kPiece)
m_Lines[m_iReadyLineIndex].m_LinePieces.back().m_dwStatus = dwStatus;
return m_Lines[m_iReadyLineIndex].m_LinePieces.back().m_dwStatus;
}
if (m_pCurLine->m_LineChars.empty())
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
CFX_Char* tc = m_pCurLine->GetChar(m_pCurLine->m_LineChars.size() - 1);
tc->m_dwStatus = dwStatus;
- if (dwStatus == CFX_BreakType::Piece)
+ if (dwStatus == CFX_BreakType::kPiece)
return dwStatus;
m_iReadyLineIndex = m_pCurLine == &m_Lines[0] ? 0 : 1;
@@ -395,7 +395,7 @@
bNew = false;
}
- if (i == iLast || pTC->m_dwStatus != CFX_BreakType::None ||
+ if (i == iLast || pTC->m_dwStatus != CFX_BreakType::kNone ||
pTC->m_dwIdentity != dwIdentity) {
tp.m_iCharCount = i - j;
if (pTC->m_dwIdentity == dwIdentity) {
@@ -439,7 +439,7 @@
}
CFX_BreakPiece tp;
- tp.m_dwStatus = CFX_BreakType::Piece;
+ tp.m_dwStatus = CFX_BreakType::kPiece;
tp.m_iStartPos = m_pCurLine->m_iStart;
tp.m_pChars = &chars;
@@ -464,7 +464,7 @@
dwIdentity = pTC->m_dwIdentity;
tp.m_dwIdentity = dwIdentity;
tp.m_pUserData = pTC->m_pUserData;
- tp.m_dwStatus = CFX_BreakType::Piece;
+ tp.m_dwStatus = CFX_BreakType::kPiece;
++i;
} else if (iBidiLevel != pTC->m_iBidiLevel ||
pTC->m_dwIdentity != dwIdentity) {
@@ -546,7 +546,7 @@
int32_t iOffset = m_iLineWidth - iNetWidth;
if (iGapChars > 0 && (m_iAlignment == CFX_RTFLineAlignment::Distributed ||
(m_iAlignment == CFX_RTFLineAlignment::Justified &&
- dwStatus != CFX_BreakType::Paragraph))) {
+ dwStatus != CFX_BreakType::kParagraph))) {
int32_t iStart = -1;
for (const auto& tpo : tpos) {
CFX_BreakPiece& ttp = m_pCurLine->m_LinePieces[tpo.index];
@@ -712,7 +712,7 @@
pCurLine->DecrementArabicCharCount();
pNextLine->IncrementArabicCharCount();
}
- pNextLine->m_LineChars[i].m_dwStatus = CFX_BreakType::None;
+ pNextLine->m_LineChars[i].m_dwStatus = CFX_BreakType::kNone;
}
}
diff --git a/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp
index d198a6c..7ccb919 100644
--- a/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp
@@ -43,9 +43,9 @@
WideString str(L"Input String.");
for (wchar_t ch : str)
- EXPECT_EQ(CFX_BreakType::None, rtf_break->AppendChar(ch));
+ EXPECT_EQ(CFX_BreakType::kNone, rtf_break->AppendChar(ch));
- EXPECT_EQ(CFX_BreakType::Paragraph, rtf_break->AppendChar(L'\n'));
+ EXPECT_EQ(CFX_BreakType::kParagraph, rtf_break->AppendChar(L'\n'));
ASSERT_EQ(1, rtf_break->CountBreakPieces());
EXPECT_EQ(str + L"\n", rtf_break->GetBreakPieceUnstable(0)->GetString());
@@ -55,22 +55,22 @@
str = L"Second str.";
for (wchar_t ch : str)
- EXPECT_EQ(CFX_BreakType::None, rtf_break->AppendChar(ch));
+ EXPECT_EQ(CFX_BreakType::kNone, rtf_break->AppendChar(ch));
// Force the end of the break at the end of the string.
- rtf_break->EndBreak(CFX_BreakType::Paragraph);
+ rtf_break->EndBreak(CFX_BreakType::kParagraph);
ASSERT_EQ(1, rtf_break->CountBreakPieces());
EXPECT_EQ(str, rtf_break->GetBreakPieceUnstable(0)->GetString());
}
TEST_F(CFX_RTFBreakTest, ControlCharacters) {
auto rtf_break = CreateBreak(FX_LAYOUTSTYLE_ExpandTab);
- EXPECT_EQ(CFX_BreakType::Line, rtf_break->AppendChar(L'\v'));
- EXPECT_EQ(CFX_BreakType::Page, rtf_break->AppendChar(L'\f'));
+ EXPECT_EQ(CFX_BreakType::kLine, rtf_break->AppendChar(L'\v'));
+ EXPECT_EQ(CFX_BreakType::kPage, rtf_break->AppendChar(L'\f'));
const wchar_t kUnicodeParagraphSeparator = 0x2029;
- EXPECT_EQ(CFX_BreakType::Paragraph,
+ EXPECT_EQ(CFX_BreakType::kParagraph,
rtf_break->AppendChar(kUnicodeParagraphSeparator));
- EXPECT_EQ(CFX_BreakType::Paragraph, rtf_break->AppendChar(L'\n'));
+ EXPECT_EQ(CFX_BreakType::kParagraph, rtf_break->AppendChar(L'\n'));
ASSERT_EQ(1, rtf_break->CountBreakPieces());
EXPECT_EQ(L"\v", rtf_break->GetBreakPieceUnstable(0)->GetString());
diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp
index 08025b4..6e8e89c 100644
--- a/xfa/fgas/layout/cfx_txtbreak.cpp
+++ b/xfa/fgas/layout/cfx_txtbreak.cpp
@@ -100,26 +100,26 @@
CFX_BreakType CFX_TxtBreak::AppendChar_Control(CFX_Char* pCurChar) {
m_eCharType = FX_CHARTYPE::kControl;
- CFX_BreakType dwRet = CFX_BreakType::None;
+ CFX_BreakType dwRet = CFX_BreakType::kNone;
if (!m_bSingleLine) {
wchar_t wch = pCurChar->char_code();
switch (wch) {
case L'\v':
case 0x2028:
- dwRet = CFX_BreakType::Line;
+ dwRet = CFX_BreakType::kLine;
break;
case L'\f':
- dwRet = CFX_BreakType::Page;
+ dwRet = CFX_BreakType::kPage;
break;
case 0x2029:
- dwRet = CFX_BreakType::Paragraph;
+ dwRet = CFX_BreakType::kParagraph;
break;
default:
if (wch == m_wParagraphBreakChar)
- dwRet = CFX_BreakType::Paragraph;
+ dwRet = CFX_BreakType::kParagraph;
break;
}
- if (dwRet != CFX_BreakType::None)
+ if (dwRet != CFX_BreakType::kNone)
dwRet = EndBreak(dwRet);
}
return dwRet;
@@ -188,8 +188,8 @@
m_pCurLine->IncrementArabicCharCount();
if (!m_bSingleLine && IsGreaterThanLineWidth(iLineWidth))
- return EndBreak(CFX_BreakType::Line);
- return CFX_BreakType::None;
+ return EndBreak(CFX_BreakType::kLine);
+ return CFX_BreakType::kNone;
}
CFX_BreakType CFX_TxtBreak::AppendChar_Others(CFX_Char* pCurChar) {
@@ -221,10 +221,10 @@
iLineWidth += iCharWidthValid;
if (!m_bSingleLine && chartype != FX_CHARTYPE::kSpace &&
IsGreaterThanLineWidth(iLineWidth)) {
- return EndBreak(CFX_BreakType::Line);
+ return EndBreak(CFX_BreakType::kLine);
}
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
}
CFX_BreakType CFX_TxtBreak::AppendChar(wchar_t wch) {
@@ -234,24 +234,24 @@
CFX_Char* pCurChar = &m_pCurLine->m_LineChars.back();
pCurChar->m_dwCharStyles = m_iAlignment | (1 << 8);
- CFX_BreakType dwRet1 = CFX_BreakType::None;
+ CFX_BreakType dwRet1 = CFX_BreakType::kNone;
if (chartype != FX_CHARTYPE::kCombination &&
GetUnifiedCharType(m_eCharType) != GetUnifiedCharType(chartype) &&
m_eCharType != FX_CHARTYPE::kUnknown && !m_bSingleLine &&
IsGreaterThanLineWidth(m_pCurLine->m_iWidth) &&
(m_eCharType != FX_CHARTYPE::kSpace ||
chartype != FX_CHARTYPE::kControl)) {
- dwRet1 = EndBreak(CFX_BreakType::Line);
+ dwRet1 = EndBreak(CFX_BreakType::kLine);
if (!m_pCurLine->m_LineChars.empty())
pCurChar = &m_pCurLine->m_LineChars.back();
}
- CFX_BreakType dwRet2 = CFX_BreakType::None;
+ CFX_BreakType dwRet2 = CFX_BreakType::kNone;
if (wch == m_wParagraphBreakChar) {
// This is handled in AppendChar_Control, but it seems like \n and \r
// don't get matched as control characters so we go into AppendChar_other
// and never detect the new paragraph ...
- dwRet2 = CFX_BreakType::Paragraph;
+ dwRet2 = CFX_BreakType::kParagraph;
EndBreak(dwRet2);
} else {
switch (chartype) {
@@ -340,7 +340,7 @@
}
CFX_Char::BidiLine(&chars, iBidiNum + 1);
- tp.m_dwStatus = CFX_BreakType::Piece;
+ tp.m_dwStatus = CFX_BreakType::kPiece;
tp.m_iStartPos = m_pCurLine->m_iStart;
tp.m_pChars = &m_pCurLine->m_LineChars;
int32_t iBidiLevel = -1;
@@ -358,10 +358,10 @@
tp.m_dwCharStyles = pTC->m_dwCharStyles;
tp.m_iHorizontalScale = pTC->horizonal_scale();
tp.m_iVerticalScale = pTC->vertical_scale();
- tp.m_dwStatus = CFX_BreakType::Piece;
+ tp.m_dwStatus = CFX_BreakType::kPiece;
}
if (iBidiLevel != pTC->m_iBidiLevel ||
- pTC->m_dwStatus != CFX_BreakType::None) {
+ pTC->m_dwStatus != CFX_BreakType::kNone) {
if (iBidiLevel == pTC->m_iBidiLevel) {
tp.m_dwStatus = pTC->m_dwStatus;
iCharWidth = pTC->m_iCharWidth;
@@ -446,7 +446,7 @@
int32_t iOffset = m_iLineWidth - iNetWidth;
if (iGapChars > 0 && m_iAlignment & CFX_TxtLineAlignment_Justified &&
- dwStatus != CFX_BreakType::Paragraph) {
+ dwStatus != CFX_BreakType::kParagraph) {
int32_t iStart = -1;
for (auto& tpo : tpos) {
CFX_BreakPiece& ttp = m_pCurLine->m_LinePieces[tpo.index];
@@ -483,28 +483,28 @@
}
CFX_BreakType CFX_TxtBreak::EndBreak(CFX_BreakType dwStatus) {
- ASSERT(dwStatus != CFX_BreakType::None);
+ ASSERT(dwStatus != CFX_BreakType::kNone);
if (!m_pCurLine->m_LinePieces.empty()) {
- if (dwStatus != CFX_BreakType::Piece)
+ if (dwStatus != CFX_BreakType::kPiece)
m_pCurLine->m_LinePieces.back().m_dwStatus = dwStatus;
return m_pCurLine->m_LinePieces.back().m_dwStatus;
}
if (HasLine()) {
if (m_Lines[m_iReadyLineIndex].m_LinePieces.empty())
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
- if (dwStatus != CFX_BreakType::Piece)
+ if (dwStatus != CFX_BreakType::kPiece)
m_Lines[m_iReadyLineIndex].m_LinePieces.back().m_dwStatus = dwStatus;
return m_Lines[m_iReadyLineIndex].m_LinePieces.back().m_dwStatus;
}
if (m_pCurLine->m_LineChars.empty())
- return CFX_BreakType::None;
+ return CFX_BreakType::kNone;
m_pCurLine->m_LineChars.back().m_dwStatus = dwStatus;
- if (dwStatus == CFX_BreakType::Piece)
+ if (dwStatus == CFX_BreakType::kPiece)
return dwStatus;
m_iReadyLineIndex = m_pCurLine == &m_Lines[0] ? 0 : 1;
@@ -645,7 +645,7 @@
pNextLine->IncrementArabicCharCount();
}
iWidth += std::max(0, pNextLine->m_LineChars[i].m_iCharWidth);
- pNextLine->m_LineChars[i].m_dwStatus = CFX_BreakType::None;
+ pNextLine->m_LineChars[i].m_dwStatus = CFX_BreakType::kNone;
}
pNextLine->m_iWidth = iWidth;
}
diff --git a/xfa/fgas/layout/cfx_txtbreak.h b/xfa/fgas/layout/cfx_txtbreak.h
index 9b7351f..ba9e6e9 100644
--- a/xfa/fgas/layout/cfx_txtbreak.h
+++ b/xfa/fgas/layout/cfx_txtbreak.h
@@ -28,7 +28,7 @@
};
inline bool CFX_BreakTypeNoneOrPiece(CFX_BreakType type) {
- return type == CFX_BreakType::None || type == CFX_BreakType::Piece;
+ return type == CFX_BreakType::kNone || type == CFX_BreakType::kPiece;
}
class CFX_TxtBreak final : public CFX_Break {
diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp
index c31cb4d..7bd4fe9 100644
--- a/xfa/fwl/cfwl_checkbox.cpp
+++ b/xfa/fwl/cfwl_checkbox.cpp
@@ -201,13 +201,13 @@
return;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus:
+ case CFWL_Message::Type::kSetFocus:
OnFocusChanged(true);
break;
- case CFWL_Message::Type::KillFocus:
+ case CFWL_Message::Type::kKillFocus:
OnFocusChanged(false);
break;
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
switch (pMsg->m_dwCmd) {
case FWL_MouseCommand::LeftButtonDown:
@@ -227,9 +227,9 @@
}
break;
}
- case CFWL_Message::Type::Key: {
+ case CFWL_Message::Type::kKey: {
CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
- if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
+ if (pKey->m_dwCmd == CFWL_MessageKey::Type::kKeyDown)
OnKeyDown(pKey);
break;
}
diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp
index 4e12e0c..8cce9ff 100644
--- a/xfa/fwl/cfwl_combobox.cpp
+++ b/xfa/fwl/cfwl_combobox.cpp
@@ -432,17 +432,17 @@
bool backDefault = true;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus: {
+ case CFWL_Message::Type::kSetFocus: {
backDefault = false;
OnFocusChanged(pMessage, true);
break;
}
- case CFWL_Message::Type::KillFocus: {
+ case CFWL_Message::Type::kKillFocus: {
backDefault = false;
OnFocusChanged(pMessage, false);
break;
}
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
backDefault = false;
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
switch (pMsg->m_dwCmd) {
@@ -457,12 +457,13 @@
}
break;
}
- case CFWL_Message::Type::Key: {
+ case CFWL_Message::Type::kKey: {
backDefault = false;
CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
- if (pKey->m_dwCmd == FWL_KeyCommand::KeyUp)
+ if (pKey->m_dwCmd == CFWL_MessageKey::Type::kKeyUp)
break;
- if (IsDropListVisible() && pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
+ if (IsDropListVisible() &&
+ pKey->m_dwCmd == CFWL_MessageKey::Type::kKeyDown) {
bool bListKey = pKey->m_dwKeyCode == XFA_FWL_VKEY_Up ||
pKey->m_dwKeyCode == XFA_FWL_VKEY_Down ||
pKey->m_dwKeyCode == XFA_FWL_VKEY_Return ||
diff --git a/xfa/fwl/cfwl_comboedit.cpp b/xfa/fwl/cfwl_comboedit.cpp
index 1b04c39..720ce05 100644
--- a/xfa/fwl/cfwl_comboedit.cpp
+++ b/xfa/fwl/cfwl_comboedit.cpp
@@ -47,17 +47,17 @@
bool backDefault = true;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus: {
+ case CFWL_Message::Type::kSetFocus: {
m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
backDefault = false;
break;
}
- case CFWL_Message::Type::KillFocus: {
+ case CFWL_Message::Type::kKillFocus: {
m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
backDefault = false;
break;
}
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
if ((pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonDown) &&
((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)) {
diff --git a/xfa/fwl/cfwl_combolist.cpp b/xfa/fwl/cfwl_combolist.cpp
index 01163c3..3884a60 100644
--- a/xfa/fwl/cfwl_combolist.cpp
+++ b/xfa/fwl/cfwl_combolist.cpp
@@ -76,10 +76,10 @@
CFWL_Message::Type type = pMessage->GetType();
bool backDefault = true;
- if (type == CFWL_Message::Type::SetFocus ||
- type == CFWL_Message::Type::KillFocus) {
- OnDropListFocusChanged(pMessage, type == CFWL_Message::Type::SetFocus);
- } else if (type == CFWL_Message::Type::Mouse) {
+ if (type == CFWL_Message::Type::kSetFocus ||
+ type == CFWL_Message::Type::kKillFocus) {
+ OnDropListFocusChanged(pMessage, type == CFWL_Message::Type::kSetFocus);
+ } else if (type == CFWL_Message::Type::kMouse) {
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
CFWL_ScrollBar* vertSB = GetVertScrollBar();
if (IsShowScrollBar(true) && vertSB) {
@@ -109,7 +109,7 @@
default:
break;
}
- } else if (type == CFWL_Message::Type::Key) {
+ } else if (type == CFWL_Message::Type::kKey) {
backDefault = !OnDropListKey(static_cast<CFWL_MessageKey*>(pMessage));
}
if (backDefault)
@@ -185,7 +185,7 @@
bool CFWL_ComboList::OnDropListKey(CFWL_MessageKey* pKey) {
CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
bool bPropagate = false;
- if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
+ if (pKey->m_dwCmd == CFWL_MessageKey::Type::kKeyDown) {
uint32_t dwKeyCode = pKey->m_dwKeyCode;
switch (dwKeyCode) {
case XFA_FWL_VKEY_Return:
@@ -204,7 +204,7 @@
break;
}
}
- } else if (pKey->m_dwCmd == FWL_KeyCommand::Char) {
+ } else if (pKey->m_dwCmd == CFWL_MessageKey::Type::kChar) {
bPropagate = true;
}
if (bPropagate) {
diff --git a/xfa/fwl/cfwl_datetimeedit.cpp b/xfa/fwl/cfwl_datetimeedit.cpp
index 313e89a..126c26c 100644
--- a/xfa/fwl/cfwl_datetimeedit.cpp
+++ b/xfa/fwl/cfwl_datetimeedit.cpp
@@ -22,7 +22,7 @@
CFWL_DateTimeEdit::~CFWL_DateTimeEdit() = default;
void CFWL_DateTimeEdit::OnProcessMessage(CFWL_Message* pMessage) {
- if (pMessage->GetType() != CFWL_Message::Type::Mouse) {
+ if (pMessage->GetType() != CFWL_Message::Type::kMouse) {
CFWL_Edit::OnProcessMessage(pMessage);
return;
}
diff --git a/xfa/fwl/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp
index 4721197..241e969 100644
--- a/xfa/fwl/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/cfwl_datetimepicker.cpp
@@ -338,13 +338,13 @@
return;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus:
+ case CFWL_Message::Type::kSetFocus:
OnFocusChanged(pMessage, true);
break;
- case CFWL_Message::Type::KillFocus:
+ case CFWL_Message::Type::kKillFocus:
OnFocusChanged(pMessage, false);
break;
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMouse = static_cast<CFWL_MessageMouse*>(pMessage);
switch (pMouse->m_dwCmd) {
case FWL_MouseCommand::LeftButtonDown:
@@ -364,7 +364,7 @@
}
break;
}
- case CFWL_Message::Type::Key: {
+ case CFWL_Message::Type::kKey: {
if (m_pEdit->GetStates() & FWL_WGTSTATE_Focused) {
m_pEdit->GetDelegate()->OnProcessMessage(pMessage);
return;
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 4abe00c..e966d95 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -1006,13 +1006,13 @@
return;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus:
+ case CFWL_Message::Type::kSetFocus:
OnFocusChanged(pMessage, true);
break;
- case CFWL_Message::Type::KillFocus:
+ case CFWL_Message::Type::kKillFocus:
OnFocusChanged(pMessage, false);
break;
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
switch (pMsg->m_dwCmd) {
case FWL_MouseCommand::LeftButtonDown:
@@ -1035,11 +1035,11 @@
}
break;
}
- case CFWL_Message::Type::Key: {
+ case CFWL_Message::Type::kKey: {
CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
- if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
+ if (pKey->m_dwCmd == CFWL_MessageKey::Type::kKeyDown)
OnKeyDown(pKey);
- else if (pKey->m_dwCmd == FWL_KeyCommand::Char)
+ else if (pKey->m_dwCmd == CFWL_MessageKey::Type::kChar)
OnChar(pKey);
break;
}
diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp
index 32d4de0..f473a09 100644
--- a/xfa/fwl/cfwl_listbox.cpp
+++ b/xfa/fwl/cfwl_listbox.cpp
@@ -655,13 +655,13 @@
return;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus:
+ case CFWL_Message::Type::kSetFocus:
OnFocusChanged(pMessage, true);
break;
- case CFWL_Message::Type::KillFocus:
+ case CFWL_Message::Type::kKillFocus:
OnFocusChanged(pMessage, false);
break;
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
switch (pMsg->m_dwCmd) {
case FWL_MouseCommand::LeftButtonDown:
@@ -675,12 +675,12 @@
}
break;
}
- case CFWL_Message::Type::MouseWheel:
+ case CFWL_Message::Type::kMouseWheel:
OnMouseWheel(static_cast<CFWL_MessageMouseWheel*>(pMessage));
break;
- case CFWL_Message::Type::Key: {
+ case CFWL_Message::Type::kKey: {
CFWL_MessageKey* pMsg = static_cast<CFWL_MessageKey*>(pMessage);
- if (pMsg->m_dwCmd == FWL_KeyCommand::KeyDown)
+ if (pMsg->m_dwCmd == CFWL_MessageKey::Type::kKeyDown)
OnKeyDown(pMsg);
break;
}
diff --git a/xfa/fwl/cfwl_message.h b/xfa/fwl/cfwl_message.h
index 43aaf09..1ae559e 100644
--- a/xfa/fwl/cfwl_message.h
+++ b/xfa/fwl/cfwl_message.h
@@ -15,7 +15,7 @@
class CFWL_Message {
public:
- enum class Type { Key, KillFocus, Mouse, MouseWheel, SetFocus };
+ enum class Type { kKey, kKillFocus, kMouse, kMouseWheel, kSetFocus };
virtual ~CFWL_Message();
diff --git a/xfa/fwl/cfwl_messagekey.cpp b/xfa/fwl/cfwl_messagekey.cpp
index bf9ded8..d76cc86 100644
--- a/xfa/fwl/cfwl_messagekey.cpp
+++ b/xfa/fwl/cfwl_messagekey.cpp
@@ -9,10 +9,10 @@
#include <memory>
CFWL_MessageKey::CFWL_MessageKey(CFWL_Widget* pDstTarget,
- FWL_KeyCommand cmd,
+ Type cmd,
uint32_t flags,
uint32_t keycode)
- : CFWL_Message(CFWL_Message::Type::Key, nullptr, pDstTarget),
+ : CFWL_Message(CFWL_Message::Type::kKey, nullptr, pDstTarget),
m_dwCmd(cmd),
m_dwFlags(flags),
m_dwKeyCode(keycode) {}
diff --git a/xfa/fwl/cfwl_messagekey.h b/xfa/fwl/cfwl_messagekey.h
index b122647..f70c1bb 100644
--- a/xfa/fwl/cfwl_messagekey.h
+++ b/xfa/fwl/cfwl_messagekey.h
@@ -11,17 +11,17 @@
#include "xfa/fwl/cfwl_message.h"
-enum class FWL_KeyCommand { KeyDown, KeyUp, Char };
-
class CFWL_MessageKey final : public CFWL_Message {
public:
+ enum class Type { kKeyDown, kKeyUp, kChar };
+
CFWL_MessageKey(CFWL_Widget* pDstTarget,
- FWL_KeyCommand cmd,
+ Type cmd,
uint32_t flags,
uint32_t keycode);
~CFWL_MessageKey() override;
- const FWL_KeyCommand m_dwCmd;
+ const Type m_dwCmd;
const uint32_t m_dwFlags;
const uint32_t m_dwKeyCode;
};
diff --git a/xfa/fwl/cfwl_messagekillfocus.cpp b/xfa/fwl/cfwl_messagekillfocus.cpp
index d7c426b..7917815 100644
--- a/xfa/fwl/cfwl_messagekillfocus.cpp
+++ b/xfa/fwl/cfwl_messagekillfocus.cpp
@@ -13,6 +13,6 @@
CFWL_MessageKillFocus::CFWL_MessageKillFocus(CFWL_Widget* pSrcTarget,
CFWL_Widget* pDstTarget)
- : CFWL_Message(CFWL_Message::Type::KillFocus, pSrcTarget, pDstTarget) {}
+ : CFWL_Message(CFWL_Message::Type::kKillFocus, pSrcTarget, pDstTarget) {}
CFWL_MessageKillFocus::~CFWL_MessageKillFocus() = default;
diff --git a/xfa/fwl/cfwl_messagemouse.cpp b/xfa/fwl/cfwl_messagemouse.cpp
index 68b50c3..4a23ba2 100644
--- a/xfa/fwl/cfwl_messagemouse.cpp
+++ b/xfa/fwl/cfwl_messagemouse.cpp
@@ -10,14 +10,14 @@
CFWL_MessageMouse::CFWL_MessageMouse(CFWL_Widget* pDstTarget,
FWL_MouseCommand cmd)
- : CFWL_Message(CFWL_Message::Type::Mouse, nullptr, pDstTarget),
+ : CFWL_Message(CFWL_Message::Type::kMouse, nullptr, pDstTarget),
m_dwCmd(cmd) {}
CFWL_MessageMouse::CFWL_MessageMouse(CFWL_Widget* pDstTarget,
FWL_MouseCommand cmd,
uint32_t flags,
CFX_PointF pos)
- : CFWL_Message(CFWL_Message::Type::Mouse, nullptr, pDstTarget),
+ : CFWL_Message(CFWL_Message::Type::kMouse, nullptr, pDstTarget),
m_dwCmd(cmd),
m_dwFlags(flags),
m_pos(pos) {}
diff --git a/xfa/fwl/cfwl_messagemousewheel.cpp b/xfa/fwl/cfwl_messagemousewheel.cpp
index 9da3b7c..bd62398 100644
--- a/xfa/fwl/cfwl_messagemousewheel.cpp
+++ b/xfa/fwl/cfwl_messagemousewheel.cpp
@@ -9,7 +9,7 @@
CFWL_MessageMouseWheel::CFWL_MessageMouseWheel(CFWL_Widget* destination,
const CFX_PointF& pos,
const CFX_Vector& delta)
- : CFWL_Message(CFWL_Message::Type::MouseWheel, nullptr, destination),
+ : CFWL_Message(CFWL_Message::Type::kMouseWheel, nullptr, destination),
pos_(pos),
delta_(delta) {}
diff --git a/xfa/fwl/cfwl_messagesetfocus.cpp b/xfa/fwl/cfwl_messagesetfocus.cpp
index f9abc7b..616d637 100644
--- a/xfa/fwl/cfwl_messagesetfocus.cpp
+++ b/xfa/fwl/cfwl_messagesetfocus.cpp
@@ -10,6 +10,6 @@
CFWL_MessageSetFocus::CFWL_MessageSetFocus(CFWL_Widget* pSrcTarget,
CFWL_Widget* pDstTarget)
- : CFWL_Message(CFWL_Message::Type::SetFocus, pSrcTarget, pDstTarget) {}
+ : CFWL_Message(CFWL_Message::Type::kSetFocus, pSrcTarget, pDstTarget) {}
CFWL_MessageSetFocus::~CFWL_MessageSetFocus() = default;
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
index 760316b..c4bdb15 100644
--- a/xfa/fwl/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -681,13 +681,13 @@
return;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus:
- case CFWL_Message::Type::KillFocus:
+ case CFWL_Message::Type::kSetFocus:
+ case CFWL_Message::Type::kKillFocus:
GetOuter()->GetDelegate()->OnProcessMessage(pMessage);
break;
- case CFWL_Message::Type::Key:
+ case CFWL_Message::Type::kKey:
break;
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMouse = static_cast<CFWL_MessageMouse*>(pMessage);
switch (pMouse->m_dwCmd) {
case FWL_MouseCommand::LeftButtonDown:
diff --git a/xfa/fwl/cfwl_notedriver.cpp b/xfa/fwl/cfwl_notedriver.cpp
index 21fe0f5..2cd91c1 100644
--- a/xfa/fwl/cfwl_notedriver.cpp
+++ b/xfa/fwl/cfwl_notedriver.cpp
@@ -107,34 +107,34 @@
if (!DispatchMessage(pMessage.get(), pMessageForm))
return;
- if (pMessage->GetType() == CFWL_Message::Type::Mouse)
+ if (pMessage->GetType() == CFWL_Message::Type::kMouse)
MouseSecondary(pMessage.get());
}
bool CFWL_NoteDriver::DispatchMessage(CFWL_Message* pMessage,
CFWL_Widget* pMessageForm) {
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus: {
+ case CFWL_Message::Type::kSetFocus: {
if (!DoSetFocus(pMessage, pMessageForm))
return false;
break;
}
- case CFWL_Message::Type::KillFocus: {
+ case CFWL_Message::Type::kKillFocus: {
if (!DoKillFocus(pMessage, pMessageForm))
return false;
break;
}
- case CFWL_Message::Type::Key: {
+ case CFWL_Message::Type::kKey: {
if (!DoKey(pMessage, pMessageForm))
return false;
break;
}
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
if (!DoMouse(pMessage, pMessageForm))
return false;
break;
}
- case CFWL_Message::Type::MouseWheel: {
+ case CFWL_Message::Type::kMouseWheel: {
if (!DoWheel(pMessage, pMessageForm))
return false;
break;
@@ -165,7 +165,7 @@
bool CFWL_NoteDriver::DoKey(CFWL_Message* pMessage, CFWL_Widget* pMessageForm) {
CFWL_MessageKey* pMsg = static_cast<CFWL_MessageKey*>(pMessage);
#if !defined(OS_MACOSX)
- if (pMsg->m_dwCmd == FWL_KeyCommand::KeyDown &&
+ if (pMsg->m_dwCmd == CFWL_MessageKey::Type::kKeyDown &&
pMsg->m_dwKeyCode == XFA_FWL_VKEY_Tab) {
CFWL_WidgetMgr* pWidgetMgr = pMessageForm->GetOwnerApp()->GetWidgetMgr();
CFWL_Widget* pForm = GetMessageForm(pMsg->GetDstTarget());
@@ -192,7 +192,7 @@
return true;
}
- if (pMsg->m_dwCmd == FWL_KeyCommand::KeyDown &&
+ if (pMsg->m_dwCmd == CFWL_MessageKey::Type::kKeyDown &&
pMsg->m_dwKeyCode == XFA_FWL_VKEY_Return) {
CFWL_WidgetMgr* pWidgetMgr = pMessageForm->GetOwnerApp()->GetWidgetMgr();
CFWL_Widget* pDefButton = pWidgetMgr->GetDefaultButton(pMessageForm);
diff --git a/xfa/fwl/cfwl_pushbutton.cpp b/xfa/fwl/cfwl_pushbutton.cpp
index 8ada727..3f0cce3 100644
--- a/xfa/fwl/cfwl_pushbutton.cpp
+++ b/xfa/fwl/cfwl_pushbutton.cpp
@@ -97,13 +97,13 @@
return;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::SetFocus:
+ case CFWL_Message::Type::kSetFocus:
OnFocusChanged(pMessage, true);
break;
- case CFWL_Message::Type::KillFocus:
+ case CFWL_Message::Type::kKillFocus:
OnFocusChanged(pMessage, false);
break;
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
switch (pMsg->m_dwCmd) {
case FWL_MouseCommand::LeftButtonDown:
@@ -123,9 +123,9 @@
}
break;
}
- case CFWL_Message::Type::Key: {
+ case CFWL_Message::Type::kKey: {
CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
- if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
+ if (pKey->m_dwCmd == CFWL_MessageKey::Type::kKeyDown)
OnKeyDown(pKey);
break;
}
diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp
index a2f9aa7..a7cfe8a 100644
--- a/xfa/fwl/cfwl_scrollbar.cpp
+++ b/xfa/fwl/cfwl_scrollbar.cpp
@@ -305,7 +305,7 @@
return;
CFWL_Message::Type type = pMessage->GetType();
- if (type == CFWL_Message::Type::Mouse) {
+ if (type == CFWL_Message::Type::kMouse) {
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
switch (pMsg->m_dwCmd) {
case FWL_MouseCommand::LeftButtonDown:
@@ -323,7 +323,7 @@
default:
break;
}
- } else if (type == CFWL_Message::Type::MouseWheel) {
+ } else if (type == CFWL_Message::Type::kMouseWheel) {
auto* pMsg = static_cast<CFWL_MessageMouseWheel*>(pMessage);
OnMouseWheel(pMsg->delta());
}
diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp
index 0507abd..c62d658 100644
--- a/xfa/fwl/cfwl_widget.cpp
+++ b/xfa/fwl/cfwl_widget.cpp
@@ -375,7 +375,7 @@
return;
switch (pMessage->GetType()) {
- case CFWL_Message::Type::Mouse: {
+ case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMsgMouse = static_cast<CFWL_MessageMouse*>(pMessage);
CFWL_EventMouse evt(pWidget, pWidget);
evt.m_dwCmd = pMsgMouse->m_dwCmd;
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index b10ed96..6339da2 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -580,7 +580,7 @@
return false;
SendMessageToFWLWidget(std::make_unique<CFWL_MessageKey>(
- GetNormalWidget(), FWL_KeyCommand::KeyDown, dwFlags, dwKeyCode));
+ GetNormalWidget(), CFWL_MessageKey::Type::kKeyDown, dwFlags, dwKeyCode));
return true;
}
@@ -593,7 +593,7 @@
return false;
SendMessageToFWLWidget(std::make_unique<CFWL_MessageKey>(
- GetNormalWidget(), FWL_KeyCommand::KeyUp, dwFlags, dwKeyCode));
+ GetNormalWidget(), CFWL_MessageKey::Type::kKeyUp, dwFlags, dwKeyCode));
return true;
}
@@ -612,7 +612,7 @@
return false;
SendMessageToFWLWidget(std::make_unique<CFWL_MessageKey>(
- GetNormalWidget(), FWL_KeyCommand::Char, dwFlags, dwChar));
+ GetNormalWidget(), CFWL_MessageKey::Type::kChar, dwFlags, dwChar));
return true;
}
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp
index bbe877e..1eb4204 100644
--- a/xfa/fxfa/cxfa_textlayout.cpp
+++ b/xfa/fxfa/cxfa_textlayout.cpp
@@ -684,7 +684,7 @@
if (bRet && m_pLoader)
m_pLoader->pNode = pNode;
else
- EndBreak(CFX_BreakType::Paragraph, pLinePos, bSavePieces);
+ EndBreak(CFX_BreakType::kParagraph, pLinePos, bSavePieces);
}
bool CXFA_TextLayout::LoadRichText(
@@ -836,7 +836,7 @@
m_pLoader->bFilterSpace = true;
}
if (bCurLi)
- EndBreak(CFX_BreakType::Line, pLinePos, bSavePieces);
+ EndBreak(CFX_BreakType::kLine, pLinePos, bSavePieces);
} else {
if (pContext)
eDisplay = pContext->GetDisplay();
@@ -846,8 +846,8 @@
return true;
CFX_BreakType dwStatus = (eDisplay == CFX_CSSDisplay::Block)
- ? CFX_BreakType::Paragraph
- : CFX_BreakType::Piece;
+ ? CFX_BreakType::kParagraph
+ : CFX_BreakType::kPiece;
EndBreak(dwStatus, pLinePos, bSavePieces);
if (eDisplay == CFX_CSSDisplay::Block) {
*pLinePos += fSpaceBelow;
@@ -868,7 +868,7 @@
float* pLinePos,
float fSpaceAbove,
bool bSavePieces) {
- CFX_BreakType dwStatus = CFX_BreakType::None;
+ CFX_BreakType dwStatus = CFX_BreakType::kNone;
int32_t iChar = 0;
if (m_pLoader)
iChar = m_pLoader->iChar;
@@ -880,14 +880,14 @@
wch = 0x20;
dwStatus = m_pBreak->AppendChar(wch);
- if (dwStatus != CFX_BreakType::None && dwStatus != CFX_BreakType::Piece) {
+ if (dwStatus != CFX_BreakType::kNone && dwStatus != CFX_BreakType::kPiece) {
AppendTextLine(dwStatus, pLinePos, bSavePieces, false);
if (IsEnd(bSavePieces)) {
if (m_pLoader)
m_pLoader->iChar = i;
return true;
}
- if (dwStatus == CFX_BreakType::Paragraph && m_bRichText)
+ if (dwStatus == CFX_BreakType::kParagraph && m_bRichText)
*pLinePos += fSpaceAbove;
}
}
@@ -909,7 +909,7 @@
float* pLinePos,
bool bSavePieces) {
dwStatus = m_pBreak->EndBreak(dwStatus);
- if (dwStatus != CFX_BreakType::None && dwStatus != CFX_BreakType::Piece)
+ if (dwStatus != CFX_BreakType::kNone && dwStatus != CFX_BreakType::kPiece)
AppendTextLine(dwStatus, pLinePos, bSavePieces, true);
}
@@ -1068,7 +1068,7 @@
}
m_pBreak->ClearBreakPieces();
- if (dwStatus == CFX_BreakType::Paragraph) {
+ if (dwStatus == CFX_BreakType::kParagraph) {
m_pBreak->Reset();
if (!pStyle && bEndBreak) {
CXFA_Para* para = m_pTextProvider->GetParaIfExists();
