diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 20:27:55 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 06:27:11 +0000 |
commit | a5a571307fb3306b74ab46b085cde6388270a770 (patch) | |
tree | 66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /vcl/qa/cppunit | |
parent | 17d821af6bb9df93569836a92f6bed975587fc6c (diff) |
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using
make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle"
Except some modules have their own foo::tools namespace, so there have
to use ::tools::Rectangle. This commit just moves the class from the
global namespace, it does not update pre/postwin.h yet.
Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2
Reviewed-on: https://gerrit.libreoffice.org/35923
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'vcl/qa/cppunit')
-rw-r--r-- | vcl/qa/cppunit/BitmapTest.cxx | 4 | ||||
-rw-r--r-- | vcl/qa/cppunit/canvasbitmaptest.cxx | 6 | ||||
-rw-r--r-- | vcl/qa/cppunit/complextext.cxx | 10 | ||||
-rw-r--r-- | vcl/qa/cppunit/svm/svmtest.cxx | 14 |
4 files changed, 17 insertions, 17 deletions
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index f6d69d6cba5d..f55a5b607617 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -112,8 +112,8 @@ void BitmapTest::testScale() Bitmap::ScopedWriteAccess aWriteAccess(aBitmap24Bit); aWriteAccess->Erase(COL_WHITE); aWriteAccess->SetLineColor(COL_BLACK); - aWriteAccess->DrawRect(Rectangle(1, 1, 8, 8)); - aWriteAccess->DrawRect(Rectangle(3, 3, 6, 6)); + aWriteAccess->DrawRect(tools::Rectangle(1, 1, 8, 8)); + aWriteAccess->DrawRect(tools::Rectangle(3, 3, 6, 6)); } BitmapSymmetryCheck aBitmapSymmetryCheck; diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index ff3479cdce13..211a75b1ab57 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -656,7 +656,7 @@ void CanvasBitmapTest::runTest() aWhite = Color(COL_WHITE); } pAcc->SetFillColor(COL_GREEN); - pAcc->FillRect(Rectangle(0,0,100,100)); + pAcc->FillRect(tools::Rectangle(0,0,100,100)); pAcc->SetPixel(0,0,aWhite); pAcc->SetPixel(0,1,aBlack); pAcc->SetPixel(0,2,aWhite); @@ -674,7 +674,7 @@ void CanvasBitmapTest::runTest() if( pAcc.get() ) { pAcc->SetFillColor(COL_BLACK); - pAcc->FillRect(Rectangle(0,0,100,100)); + pAcc->FillRect(tools::Rectangle(0,0,100,100)); pAcc->SetPixel(0,0,BitmapColor(1)); pAcc->SetPixel(0,1,BitmapColor(0)); pAcc->SetPixel(0,2,BitmapColor(1)); @@ -692,7 +692,7 @@ void CanvasBitmapTest::runTest() if( pAcc ) { pAcc->SetFillColor(COL_BLACK); - pAcc->FillRect(Rectangle(0,0,100,100)); + pAcc->FillRect(tools::Rectangle(0,0,100,100)); pAcc->SetPixel(0,0,BitmapColor(255)); pAcc->SetPixel(0,1,BitmapColor(0)); pAcc->SetPixel(0,2,BitmapColor(255)); diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index f785b4a60591..f2c33363fb92 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -85,20 +85,20 @@ void VclComplexTextTest::testArabic() // exact bounding rectangle, not essentially the same as text width/height #if defined(MACOSX) || defined(_WIN32) // FIXME: fails on some Linux tinderboxes, might be a FreeType issue. - Rectangle aBoundRect; + tools::Rectangle aBoundRect; pOutDev->GetTextBoundRect(aBoundRect, aOneTwoThree); - CPPUNIT_ASSERT_EQUAL(Rectangle(0, 1, 71, 15), aBoundRect); + CPPUNIT_ASSERT_EQUAL(tools::Rectangle(0, 1, 71, 15), aBoundRect); #endif // normal orientation - Rectangle aInput; - Rectangle aRect = pOutDev->GetTextRect( aInput, aOneTwoThree ); + tools::Rectangle aInput; + tools::Rectangle aRect = pOutDev->GetTextRect( aInput, aOneTwoThree ); // now rotate 270 degress vcl::Font aRotated( aFont ); aRotated.SetOrientation( 2700 ); pOutDev->SetFont( aRotated ); - Rectangle aRectRot = pOutDev->GetTextRect( aInput, aOneTwoThree ); + tools::Rectangle aRectRot = pOutDev->GetTextRect( aInput, aOneTwoThree ); // Check that we did do the rotation ... #if 0 diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx index f90b1992d536..619fa07e684d 100644 --- a/vcl/qa/cppunit/svm/svmtest.cxx +++ b/vcl/qa/cppunit/svm/svmtest.cxx @@ -343,7 +343,7 @@ void SvmTest::testRect() pVirtualDev->SetLineColor(Color(0x123456)); pVirtualDev->SetFillColor(Color(0x654321)); - pVirtualDev->DrawRect(Rectangle(Point(1, 2), Size(4, 4))); + pVirtualDev->DrawRect(tools::Rectangle(Point(1, 2), Size(4, 4))); checkRect(writeAndRead(aGDIMetaFile, "rect.svm")); } @@ -371,7 +371,7 @@ void SvmTest::testRoundRect() pVirtualDev->SetLineColor(Color(0x123456)); pVirtualDev->SetFillColor(Color(0x654321)); - pVirtualDev->DrawRect(Rectangle(Point(1, 2), Size(4, 4)), 1, 2); + pVirtualDev->DrawRect(tools::Rectangle(Point(1, 2), Size(4, 4)), 1, 2); checkRoundRect(writeAndRead(aGDIMetaFile, "roundrect.svm")); } @@ -398,7 +398,7 @@ void SvmTest::testEllipse() pVirtualDev->SetLineColor(Color(0x123456)); pVirtualDev->SetFillColor(Color(0x654321)); - pVirtualDev->DrawEllipse(Rectangle(Point(1, 2), Size(4, 4))); + pVirtualDev->DrawEllipse(tools::Rectangle(Point(1, 2), Size(4, 4))); checkEllipse(writeAndRead(aGDIMetaFile, "ellipse.svm")); } @@ -428,7 +428,7 @@ void SvmTest::testArc() pVirtualDev->SetLineColor(Color(0x123456)); pVirtualDev->SetFillColor(Color(0x654321)); - pVirtualDev->DrawArc(Rectangle(Point(1, 2), Size(4, 4)), Point(10, 11), Point(12, 13)); + pVirtualDev->DrawArc(tools::Rectangle(Point(1, 2), Size(4, 4)), Point(10, 11), Point(12, 13)); checkArc(writeAndRead(aGDIMetaFile, "arc.svm")); } @@ -458,7 +458,7 @@ void SvmTest::testPie() pVirtualDev->SetLineColor(Color(0x123456)); pVirtualDev->SetFillColor(Color(0x654321)); - pVirtualDev->DrawPie(Rectangle(Point(11, 12), Size(4, 4)), Point(20, 21), Point(22, 23)); + pVirtualDev->DrawPie(tools::Rectangle(Point(11, 12), Size(4, 4)), Point(20, 21), Point(22, 23)); checkPie(writeAndRead(aGDIMetaFile, "pie.svm")); } @@ -488,7 +488,7 @@ void SvmTest::testChord() pVirtualDev->SetLineColor(Color(0x123456)); pVirtualDev->SetFillColor(Color(0x654321)); - pVirtualDev->DrawChord(Rectangle(Point(21, 22), Size(4, 4)), Point(30, 31), Point(32, 33)); + pVirtualDev->DrawChord(tools::Rectangle(Point(21, 22), Size(4, 4)), Point(30, 31), Point(32, 33)); checkChord(writeAndRead(aGDIMetaFile, "chord.svm")); } @@ -729,7 +729,7 @@ void SvmTest::testTextRect() GDIMetaFile aGDIMetaFile; ScopedVclPtrInstance<VirtualDevice> pVirtualDev; setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile); - pVirtualDev->DrawText(Rectangle(Point(0,0), Size(5,5)), "123456", DrawTextFlags::Center); + pVirtualDev->DrawText(tools::Rectangle(Point(0,0), Size(5,5)), "123456", DrawTextFlags::Center); checkTextRect(writeAndRead(aGDIMetaFile, "textrectangle.svm")); } |