summaryrefslogtreecommitdiff
path: root/basic/qa
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-01-12 20:29:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-01-12 20:29:14 +0100
commit6070aaa47d6cede11f8cc0b54ed726fc45cb4a74 (patch)
treefe9c64b200eb663fd2fd82cb7d66d17ea199b53e /basic/qa
parent9bd84cfb52eac91ee4bd1376f1a4b053afc24ab5 (diff)
More loplugin:cstylecast: basic
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable loplugin:cstylecast for some more cases" plus solenv/clang-format/reformat-formatted-files Change-Id: I20b38196ee1b6a34384dc46d9de1b6e1b44947ae
Diffstat (limited to 'basic/qa')
-rw-r--r--basic/qa/cppunit/test_scanner.cxx38
1 files changed, 19 insertions, 19 deletions
diff --git a/basic/qa/cppunit/test_scanner.cxx b/basic/qa/cppunit/test_scanner.cxx
index 3560938295f5..4efcb829c217 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -341,8 +341,8 @@ namespace
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[3].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[4].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[4].type);
- CPPUNIT_ASSERT_EQUAL(1u, (unsigned int)symbols[5].text.getLength());
- CPPUNIT_ASSERT_EQUAL('a', (char)symbols[5].text[0]);
+ CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(symbols[5].text.getLength()));
+ CPPUNIT_ASSERT_EQUAL('a', static_cast<char>(symbols[5].text[0]));
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[5].type);
CPPUNIT_ASSERT_EQUAL(OUString("sdf"), symbols[6].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[6].type);
@@ -575,7 +575,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL(12345.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source2, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
@@ -584,35 +584,35 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL(.3, symbols[1].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- CPPUNIT_ASSERT_EQUAL(1u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
symbols = getSymbols(source3, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(123.4, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source4, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(.5, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source5, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source6, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source7, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
@@ -620,7 +620,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL(3.0, symbols[1].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source8, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
@@ -628,7 +628,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[1].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source9, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
@@ -636,21 +636,21 @@ namespace
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(OUString("dE3"), symbols[1].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- CPPUNIT_ASSERT_EQUAL(1u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
symbols = getSymbols(source10, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(12000.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source11, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(12000.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source12, errors);
CPPUNIT_ASSERT_EQUAL(size_t(6), symbols.size());
@@ -662,14 +662,14 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL(3.0, symbols[4].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[4].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[5].text);
- CPPUNIT_ASSERT_EQUAL(1u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
symbols = getSymbols(source13, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(.012, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source14, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
@@ -677,7 +677,7 @@ namespace
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(OUString("+"), symbols[1].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source15, errors);
CPPUNIT_ASSERT_EQUAL(size_t(6), symbols.size());
@@ -690,7 +690,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL(3.0, symbols[4].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[4].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[5].text);
- CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)errors);
+ CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
symbols = getSymbols(source16, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
@@ -699,7 +699,7 @@ namespace
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// This error is from a "buffer overflow" which is stupid because
// the buffer is artificially constrained by the scanner.
- CPPUNIT_ASSERT_EQUAL(1u, (unsigned int)errors); // HACK
+ CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors)); // HACK
double fInf = 0.0;
rtl::math::setInf( &fInf, false);
@@ -708,7 +708,7 @@ namespace
CPPUNIT_ASSERT_EQUAL(fInf, symbols[0].number);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(1u, (unsigned int)errors); // math error, overflow
+ CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors)); // math error, overflow
}
void ScannerTest::testDataType()