From 6bda2bf6fe8afba0b47ad89033ea3dbf6dc8b797 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 23 May 2016 14:51:43 +0200 Subject: Convert XmlReader::Text to scoped enum Change-Id: I4741b13fcf887a95b85886cb41f8236e128e81a2 Reviewed-on: https://gerrit.libreoffice.org/25364 Tested-by: Jenkins Reviewed-by: Noel Grandin --- configmgr/source/valueparser.cxx | 6 +++--- configmgr/source/xcdparser.cxx | 2 +- cppuhelper/source/servicemanager.cxx | 2 +- include/xmlreader/xmlreader.hxx | 2 +- sw/source/uibase/envelp/labelcfg.cxx | 16 ++++++++-------- vcl/opengl/win/blocklist_parser.cxx | 6 +++--- vcl/source/window/builder.cxx | 36 ++++++++++++++++++------------------ xmlreader/source/xmlreader.cxx | 6 +++--- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx index f8d98dde2d76..e732e8df58e1 100644 --- a/configmgr/source/valueparser.cxx +++ b/configmgr/source/valueparser.cxx @@ -265,13 +265,13 @@ xmlreader::XmlReader::Text ValueParser::getTextMode() const { return (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST || !separator_.isEmpty()) - ? xmlreader::XmlReader::TEXT_RAW - : xmlreader::XmlReader::TEXT_NORMALIZED; + ? xmlreader::XmlReader::Text::Raw + : xmlreader::XmlReader::Text::Normalized; default: break; } } - return xmlreader::XmlReader::TEXT_NONE; + return xmlreader::XmlReader::Text::NONE; } bool ValueParser::startElement( diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx index 0bfe298fd08c..553087a38c4a 100644 --- a/configmgr/source/xcdparser.cxx +++ b/configmgr/source/xcdparser.cxx @@ -47,7 +47,7 @@ XcdParser::~XcdParser() {} xmlreader::XmlReader::Text XcdParser::getTextMode() { return nestedParser_.is() - ? nestedParser_->getTextMode() : xmlreader::XmlReader::TEXT_NONE; + ? nestedParser_->getTextMode() : xmlreader::XmlReader::Text::NONE; } bool XcdParser::startElement( diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index 9e2a9a008f97..2785920e55c6 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -153,7 +153,7 @@ Parser::Parser( xmlreader::Span name; int nsId; xmlreader::XmlReader::Result res = reader_.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); switch (state) { case STATE_BEGIN: if (res == xmlreader::XmlReader::RESULT_BEGIN && nsId == ucNsId diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx index 5d46b1cc706e..c464211e32b0 100644 --- a/include/xmlreader/xmlreader.hxx +++ b/include/xmlreader/xmlreader.hxx @@ -46,7 +46,7 @@ public: enum { NAMESPACE_NONE = -2, NAMESPACE_UNKNOWN = -1, NAMESPACE_XML = 0 }; - enum Text { TEXT_NONE, TEXT_RAW, TEXT_NORMALIZED }; + enum class Text { NONE, Raw, Normalized }; enum Result { RESULT_BEGIN, RESULT_END, RESULT_TEXT, RESULT_DONE }; diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx index 72b22f2351dc..8cdd8813cdd8 100644 --- a/sw/source/uibase/envelp/labelcfg.cxx +++ b/sw/source/uibase/envelp/labelcfg.cxx @@ -38,7 +38,7 @@ static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader) int nsId; xmlreader::Span name; xmlreader::XmlReader::Result res; - res = reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + res = reader.nextItem(xmlreader::XmlReader::Text::NONE, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_END); (void) res; } @@ -49,9 +49,9 @@ static inline OUString lcl_getValue(xmlreader::XmlReader& reader, int nsId; xmlreader::Span name; xmlreader::XmlReader::Result res; - res = reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + res = reader.nextItem(xmlreader::XmlReader::Text::NONE, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_BEGIN && name.equals(span)); - res = reader.nextItem(xmlreader::XmlReader::TEXT_RAW, &name, &nsId); + res = reader.nextItem(xmlreader::XmlReader::Text::Raw, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_TEXT); (void) res; (void) span; OUString sTmp = name.convertFromUtf8(); @@ -86,12 +86,12 @@ SwLabelConfig::SwLabelConfig() : // fill m_aLabels and m_aManufacturers with the predefined labels res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); assert( res == xmlreader::XmlReader::RESULT_BEGIN && name.equals("manufacturers")); res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); while (res != xmlreader::XmlReader::RESULT_END) { // Opening manufacturer @@ -108,7 +108,7 @@ SwLabelConfig::SwLabelConfig() : for(;;) { // Opening label or ending manufacturer res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_END) break; assert( @@ -127,10 +127,10 @@ SwLabelConfig::SwLabelConfig() : } // Get next manufacturer or end res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); }; res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_DONE); // add to m_aLabels and m_aManufacturers the custom labels diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx index 652bb2975880..e7e17f30fb8a 100644 --- a/vcl/opengl/win/blocklist_parser.cxx +++ b/vcl/opengl/win/blocklist_parser.cxx @@ -162,7 +162,7 @@ void WinBlocklistParser::handleDevices(wgl::DriverInfo& rDriver, xmlreader::XmlR int nsId; xmlreader::XmlReader::Result res = rReader.nextItem( - xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId); + xmlreader::XmlReader::Text::Normalized, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { @@ -282,7 +282,7 @@ void WinBlocklistParser::handleList(xmlreader::XmlReader& rReader) while (true) { xmlreader::XmlReader::Result res = rReader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { @@ -318,7 +318,7 @@ void WinBlocklistParser::handleContent(xmlreader::XmlReader& rReader) int nsId; xmlreader::XmlReader::Result res = rReader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 74f1c7791411..2a466ad97688 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -546,7 +546,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) while(true) { xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_RAW, &name, &nsId); + xmlreader::XmlReader::Text::Raw, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { @@ -1900,7 +1900,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read int nsId; xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { @@ -2052,7 +2052,7 @@ void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader) while(true) { xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { @@ -2234,7 +2234,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal int nsId; xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2263,7 +2263,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal } reader.nextItem( - xmlreader::XmlReader::TEXT_RAW, &name, &nsId); + xmlreader::XmlReader::Text::Raw, &name, &nsId); if (!bTranslated) sValue = OString(name.begin, name.length); @@ -2297,7 +2297,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI int nsId; xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2334,7 +2334,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI int nsId; xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2380,7 +2380,7 @@ std::vector VclBuilder::handleItems(xmlreader::XmlReader &reader, const int nsId; xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2403,7 +2403,7 @@ std::vector VclBuilder::handleItems(xmlreader::XmlReader &reader, const } reader.nextItem( - xmlreader::XmlReader::TEXT_RAW, &name, &nsId); + xmlreader::XmlReader::Text::Raw, &name, &nsId); if (!bTranslated) sValue = OString(name.begin, name.length); @@ -2445,7 +2445,7 @@ void VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString &rID) int nsId; xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2485,7 +2485,7 @@ void VclBuilder::handleMenuChild(PopupMenu *pParent, xmlreader::XmlReader &reade while(true) { xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_BEGIN) { @@ -2547,7 +2547,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read while(true) { xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2586,7 +2586,7 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rI int nsId; xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2799,7 +2799,7 @@ VclPtr VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm while(true) { xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2877,7 +2877,7 @@ void VclBuilder::handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlr while(true) { xmlreader::XmlReader::Result res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -2933,7 +2933,7 @@ void VclBuilder::applyPackingProperty(vcl::Window *pCurrent, OString sKey(name.begin, name.length); sKey = sKey.replace('_', '-'); reader.nextItem( - xmlreader::XmlReader::TEXT_RAW, &name, &nsId); + xmlreader::XmlReader::Text::Raw, &name, &nsId); OString sValue(name.begin, name.length); if (sKey == "expand") @@ -3041,7 +3041,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI } - reader.nextItem(xmlreader::XmlReader::TEXT_RAW, &name, &nsId); + reader.nextItem(xmlreader::XmlReader::Text::Raw, &name, &nsId); if (!bTranslated) sValue = OString(name.begin, name.length); @@ -3076,7 +3076,7 @@ void VclBuilder::handleActionWidget(xmlreader::XmlReader &reader) } } - reader.nextItem(xmlreader::XmlReader::TEXT_RAW, &name, &nsId); + reader.nextItem(xmlreader::XmlReader::Text::Raw, &name, &nsId); OString sID = OString(name.begin, name.length); sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index 5f4e506771fb..41310f6ee157 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -144,11 +144,11 @@ XmlReader::Result XmlReader::nextItem(Text reportText, Span * data, int * nsId) switch (state_) { case STATE_CONTENT: switch (reportText) { - case TEXT_NONE: + case Text::NONE: return handleSkippedText(data, nsId); - case TEXT_RAW: + case Text::Raw: return handleRawText(data); - case TEXT_NORMALIZED: + case Text::Normalized: return handleNormalizedText(data); } case STATE_START_TAG: -- cgit