mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced boost::tuple with std::tuple

Browse Source 
Change-Id: Ia001c8e1e00df85d2be93e330811a1081179785d
Reviewed-on: https://gerrit.libreoffice.org/15816
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Zsolt Bölöny
2015-05-19 17:36:54 +02:00
committed by Caolán McNamara
parent d6e7dcb343
commit d0f6f00c1a
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
basegfx/source/range/b2dpolyrange.cxx
View File

@@ -25,7 +25,6 @@
#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
@@ -52,8 +51,7 @@ namespace basegfx
B2DPolyRange::ElementType getElement(sal_uInt32 nIndex) const B2DPolyRange::ElementType getElement(sal_uInt32 nIndex) const
{ {
return boost::make_tuple(maRanges[nIndex], return std::make_tuple(maRanges[nIndex], maOrient[nIndex]);
maOrient[nIndex]);
} }
void appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount) void appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount)

4
basegfx/test/basegfx2d.cxx
View File

@@ -294,9 +294,9 @@ public:
CPPUNIT_ASSERT_MESSAGE("simple poly range - count", CPPUNIT_ASSERT_MESSAGE("simple poly range - count",
aRange.count() == 2); aRange.count() == 2);
CPPUNIT_ASSERT_MESSAGE("simple poly range - first element", CPPUNIT_ASSERT_MESSAGE("simple poly range - first element",
aRange.getElement(0).head == B2DRange(0,0,1,1)); std::get<0>(aRange.getElement(0)) == B2DRange(0,0,1,1));
CPPUNIT_ASSERT_MESSAGE("simple poly range - second element", CPPUNIT_ASSERT_MESSAGE("simple poly range - second element",
aRange.getElement(1).head == B2DRange(2,2,3,3)); std::get<0>(aRange.getElement(1)) == B2DRange(2,2,3,3));
// B2DPolyRange relies on correctly orientated rects // B2DPolyRange relies on correctly orientated rects
const B2DRange aRect(0,0,1,1); const B2DRange aRect(0,0,1,1);

5
basegfx/test/boxclipper.cxx
View File

@@ -352,9 +352,8 @@ public:
const sal_uInt32 nCount=rRange.count(); const sal_uInt32 nCount=rRange.count();
for( sal_uInt32 i=0; i<nCount; ++i ) for( sal_uInt32 i=0; i<nCount; ++i )
{ {
B2DPolygon aRect=tools::createPolygonFromRect( B2DPolygon aRect=tools::createPolygonFromRect(std::get<0>(rRange.getElement(i)));
rRange.getElement(i).head); if( std::get<1>(rRange.getElement(i)) == ORIENTATION_NEGATIVE )
if( rRange.getElement(i).tail.head == ORIENTATION_NEGATIVE )
aRect.flip(); aRect.flip();
genericClip.append(aRect); genericClip.append(aRect);

4
include/basegfx/range/b2dpolyrange.hxx
View File

@@ -21,7 +21,7 @@
#define INCLUDED_BASEGFX_RANGE_B2DPOLYRANGE_HXX #define INCLUDED_BASEGFX_RANGE_B2DPOLYRANGE_HXX
#include <o3tl/cow_wrapper.hxx> #include <o3tl/cow_wrapper.hxx>
#include <boost/tuple/tuple.hpp> #include <tuple>
#include <basegfx/vector/b2enums.hxx> #include <basegfx/vector/b2enums.hxx>
#include <basegfx/basegfxdllapi.h> #include <basegfx/basegfxdllapi.h>
@@ -51,7 +51,7 @@ namespace basegfx
class BASEGFX_DLLPUBLIC B2DPolyRange class BASEGFX_DLLPUBLIC B2DPolyRange
{ {
public: public:
typedef boost::tuple<B2DRange,B2VectorOrientation> ElementType ; typedef std::tuple<B2DRange, B2VectorOrientation> ElementType;
B2DPolyRange(); B2DPolyRange();
~B2DPolyRange(); ~B2DPolyRange();