ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

canvas::tools -> canvastools

Browse Source 
At least some IDEs are confused by our multitude of `tools` namespaces,
and show errors like `namespace "tools" is ambiguous`.
This removes one such namespace. The idea is to drop all but the one
in /tools (that has tools::Long and tools::Rectangle).

Change-Id: I6077f50ad0fcc49abfadc75d9948ab63df829ff9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189948
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2025-08-20 15:23:07 +02:00
parent be6015e3c4
commit f9c16559a8
90 changed files with 331 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
+1 -1
View File
@@ -60,7 +60,7 @@ namespace slideshow::internal
private:
/// Time elapsed since activity started
::canvas::tools::ElapsedTime maTimer;
::canvastools::ElapsedTime maTimer;
/// Simple duration of activity
const double mnMinSimpleDuration;
slideshow/source/engine/activitiesqueue.cxx
+1 -1
View File
@@ -36,7 +36,7 @@ using namespace ::com::sun::star;
namespace slideshow::internal
{
ActivitiesQueue::ActivitiesQueue(
std::shared_ptr< ::canvas::tools::ElapsedTime > pPresTimer ) :
std::shared_ptr< ::canvastools::ElapsedTime > pPresTimer ) :
mpTimer(std::move( pPresTimer )),
maCurrentActivitiesWaiting(),
maCurrentActivitiesReinsert(),
slideshow/source/engine/animatedsprite.cxx
+2 -2
View File
@@ -106,7 +106,7 @@ namespace slideshow::internal
rSpriteSizePixel.getWidth() < 0.5 * maEffectiveSpriteSizePixel.getWidth() )
{
// enlarge or shrink width
aNewSize.setWidth( ::canvas::tools::nextPow2( ::basegfx::fround(rSpriteSizePixel.getWidth()) ) );
aNewSize.setWidth( ::canvastools::nextPow2( ::basegfx::fround(rSpriteSizePixel.getWidth()) ) );
bNeedResize = true;
}
@@ -114,7 +114,7 @@ namespace slideshow::internal
rSpriteSizePixel.getHeight() < 0.5*maEffectiveSpriteSizePixel.getHeight() )
{
// enlarge or shrink height, by doubling it
aNewSize.setHeight( ::canvas::tools::nextPow2( ::basegfx::fround(rSpriteSizePixel.getHeight()) ) );
aNewSize.setHeight( ::canvastools::nextPow2( ::basegfx::fround(rSpriteSizePixel.getHeight()) ) );
bNeedResize = true;
}
slideshow/source/engine/attributemap.cxx
+1 -1
View File
@@ -26,7 +26,7 @@
namespace slideshow::internal
{
typedef ::canvas::tools::ValueMap< AttributeType > AnimateAttributeMap;
typedef ::canvastools::ValueMap< AttributeType > AnimateAttributeMap;
AttributeType mapAttributeName( const OUString& rAttrName )
{
slideshow/source/engine/eventqueue.cxx
+1 -1
View File
@@ -43,7 +43,7 @@ namespace slideshow::internal
EventQueue::EventQueue(
std::shared_ptr<canvas::tools::ElapsedTime> pPresTimer )
std::shared_ptr<canvastools::ElapsedTime> pPresTimer )
: maMutex(),
maEvents(),
maNextEvents(),
slideshow/source/engine/opengl/TransitionerImpl.cxx
+1 -1
View File
@@ -307,7 +307,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
/// take the XSlideShowView and extract the parent window from it. see viewmediashape.cxx
uno::Reference< rendering::XCanvas > xCanvas(mxView->getCanvas(), uno::UNO_QUERY_THROW);
uno::Sequence< uno::Any > aDeviceParams;
::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams );
::canvastools::getDeviceInfo( xCanvas, aDeviceParams );
OUString aImplName;
aDeviceParams[ 0 ] >>= aImplName;
slideshow/source/engine/pointersymbol.cxx
+2 -2
View File
@@ -113,9 +113,9 @@ void PointerSymbol::viewAdded( const UnoViewSharedPtr& rView )
1000.0 ); // sprite should be in front of all
// other sprites
rendering::ViewState viewState;
canvas::tools::initViewState( viewState );
canvastools::initViewState( viewState );
rendering::RenderState renderState;
canvas::tools::initRenderState( renderState );
canvastools::initRenderState( renderState );
sprite->getContentCanvas()->getUNOCanvas()->drawBitmap(
mxBitmap, viewState, renderState );
slideshow/source/engine/rehearsetimingsactivity.cxx
+2 -2
View File
@@ -53,7 +53,7 @@ namespace slideshow::internal {
class RehearseTimingsActivity::WakeupEvent : public Event
{
public:
WakeupEvent( std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
WakeupEvent( std::shared_ptr< ::canvastools::ElapsedTime > const& pTimeBase,
ActivitySharedPtr const& rActivity,
ActivitiesQueue & rActivityQueue ) :
Event(u"WakeupEvent"_ustr),
@@ -99,7 +99,7 @@ public:
void setNextTimeout( double nextTime ) { mnNextTime = nextTime; }
private:
::canvas::tools::ElapsedTime maTimer;
::canvastools::ElapsedTime maTimer;
double mnNextTime;
std::weak_ptr<Activity> mpActivity;
ActivitiesQueue& mrActivityQueue;
slideshow/source/engine/rehearsetimingsactivity.hxx
+1 -1
View File
@@ -111,7 +111,7 @@ private:
ScreenUpdater& mrScreenUpdater;
EventMultiplexer& mrEventMultiplexer;
ActivitiesQueue& mrActivitiesQueue;
canvas::tools::ElapsedTime maElapsedTime;
canvastools::ElapsedTime maElapsedTime;
ViewsVecT maViews;
slideshow/source/engine/shapes/drawinglayeranimation.cxx
+1 -1
View File
@@ -183,7 +183,7 @@ private:
ShapeAttributeLayerHolder maShapeAttrLayer;
GDIMetaFileSharedPtr mpMetaFile;
IntrinsicAnimationEventHandlerSharedPtr mpListener;
canvas::tools::ElapsedTime maTimer;
canvastools::ElapsedTime maTimer;
double mfRotationAngle;
bool mbIsShapeAnimated;
bool mbIsDisposed;
slideshow/source/engine/shapes/viewappletshape.cxx
+2 -2
View File
@@ -164,7 +164,7 @@ namespace slideshow::internal
// resize surrounding window and applet to current shape size
// ==========================================================
::basegfx::B2DRange aTmpRange = ::canvas::tools::calcTransformedRectBounds(
::basegfx::B2DRange aTmpRange = ::canvastools::calcTransformedRectBounds(
rBounds,
mpViewLayer->getTransformation() );
const ::basegfx::B2IRange aPixelBounds(
@@ -229,7 +229,7 @@ namespace slideshow::internal
if( !mxFrame.is() )
return false;
::basegfx::B2DRange aTmpRange = ::canvas::tools::calcTransformedRectBounds(
::basegfx::B2DRange aTmpRange = ::canvastools::calcTransformedRectBounds(
rBounds,
mpViewLayer->getTransformation() );
const ::basegfx::B2IRange aPixelBounds(
slideshow/source/engine/shapes/viewbackgroundshape.cxx
+3 -3
View File
@@ -61,7 +61,7 @@ namespace slideshow::internal
// buffered bitmap is invalid, re-create
// determine transformed page bounds
::basegfx::B2DRectangle aTmpRect = ::canvas::tools::calcTransformedRectBounds(
::basegfx::B2DRectangle aTmpRect = ::canvastools::calcTransformedRectBounds(
maBounds,
aCanvasTransform );
@@ -164,9 +164,9 @@ namespace slideshow::internal
aTransform.invert();
rendering::RenderState aRenderState;
::canvas::tools::initRenderState( aRenderState );
::canvastools::initRenderState( aRenderState );
::canvas::tools::setRenderStateTransform( aRenderState, aTransform );
::canvastools::setRenderStateTransform( aRenderState, aTransform );
try
{
slideshow/source/engine/shapes/viewmediashape.cxx
+5 -5
View File
@@ -183,7 +183,7 @@ namespace slideshow::internal
aViewState.AffineTransform = pCanvas->getViewState().AffineTransform;
rendering::RenderState aRenderState;
::canvas::tools::initRenderState( aRenderState );
::canvastools::initRenderState( aRenderState );
const ::Size aBmpSize( aBmp.GetSizePixel() );
@@ -191,7 +191,7 @@ namespace slideshow::internal
rBounds.getHeight() / aBmpSize.Height() );
const basegfx::B2DHomMatrix aTranslation(basegfx::utils::createScaleTranslateB2DHomMatrix(
aScale, rBounds.getMinimum()));
::canvas::tools::setRenderStateTransform( aRenderState, aTranslation );
::canvastools::setRenderStateTransform( aRenderState, aTranslation );
pCanvas->getUNOCanvas()->drawBitmap( xBitmap,
aViewState,
@@ -228,7 +228,7 @@ namespace slideshow::internal
maWindowOffset.Y = aRect.Y;
}
::basegfx::B2DRange aTmpRange = ::canvas::tools::calcTransformedRectBounds(
::basegfx::B2DRange aTmpRange = ::canvastools::calcTransformedRectBounds(
rNewBounds,
mpViewLayer->getTransformation() );
const ::basegfx::B2IRange aRangePix(
@@ -313,7 +313,7 @@ namespace slideshow::internal
// create visible object
uno::Sequence< uno::Any > aDeviceParams;
if( ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ).getLength() > 1 )
if( ::canvastools::getDeviceInfo( xCanvas, aDeviceParams ).getLength() > 1 )
{
implInitializePlayerWindow( rBounds, aDeviceParams );
}
@@ -421,7 +421,7 @@ namespace slideshow::internal
if( pWindow )
{
::basegfx::B2DRange aTmpRange = ::canvas::tools::calcTransformedRectBounds( rBounds,
::basegfx::B2DRange aTmpRange = ::canvastools::calcTransformedRectBounds( rBounds,
mpViewLayer->getTransformation() );
const ::basegfx::B2IRange aRangePix(
::basegfx::unotools::b2ISurroundingRangeFromB2DRange( aTmpRange ));
slideshow/source/engine/shapes/viewshape.cxx
+5 -5
View File
@@ -183,8 +183,8 @@ namespace slideshow::internal
pRenderer->setTransformation( rTransform );
#if OSL_DEBUG_LEVEL >= 2
rendering::RenderState aRenderState;
::canvas::tools::initRenderState(aRenderState);
::canvas::tools::setRenderStateTransform(aRenderState,
::canvastools::initRenderState(aRenderState);
::canvastools::setRenderStateTransform(aRenderState,
rTransform);
aRenderState.DeviceColor.realloc(4);
aRenderState.DeviceColor[0] = 1.0;
@@ -248,7 +248,7 @@ namespace slideshow::internal
// transformation might result in smaller
// overall bounds.
::basegfx::B2DRectangle aBoundsPixel = ::canvas::tools::calcTransformedRectBounds(
::basegfx::B2DRectangle aBoundsPixel = ::canvastools::calcTransformedRectBounds(
rUntransformedArea,
rCanvasTransformation );
@@ -340,7 +340,7 @@ namespace slideshow::internal
// translational component.
const ::basegfx::B2DRectangle aNominalShapeBoundsPixel(
shapeArea2AreaPixel( aCanvasTransform,
::canvas::tools::calcTransformedRectBounds(
::canvastools::calcTransformedRectBounds(
::basegfx::B2DRectangle(0.0,0.0,1.0,1.0),
aNonTranslationalShapeTransformation ) ) );
@@ -579,7 +579,7 @@ namespace slideshow::internal
// area_ in device pixel
const ::basegfx::B2DHomMatrix aCanvasTransform(
rDestinationCanvas->getTransformation() );
::basegfx::B2DRectangle aTmpRect = ::canvas::tools::calcTransformedRectBounds(
::basegfx::B2DRectangle aTmpRect = ::canvastools::calcTransformedRectBounds(
rUpdateBounds,
aCanvasTransform );
slideshow/source/engine/slidebitmap.cxx
+2 -2
View File
@@ -58,10 +58,10 @@ namespace slideshow::internal
aViewState.AffineTransform = rCanvas->getViewState().AffineTransform;
rendering::RenderState aRenderState;
::canvas::tools::initRenderState( aRenderState );
::canvastools::initRenderState( aRenderState );
const basegfx::B2DHomMatrix aTranslation(basegfx::utils::createTranslateB2DHomMatrix(maOutputPos));
::canvas::tools::setRenderStateTransform( aRenderState, aTranslation );
::canvastools::setRenderStateTransform( aRenderState, aTranslation );
try
{
slideshow/source/engine/slideoverlaybutton.cxx
+2 -2
View File
@@ -106,9 +106,9 @@ void SlideOverlayButton::viewAdded(const UnoViewSharedPtr& rView)
1000.0); // sprite should be in front of all
// other sprites
css::rendering::ViewState viewState;
canvas::tools::initViewState(viewState);
canvastools::initViewState(viewState);
css::rendering::RenderState renderState;
canvas::tools::initRenderState(renderState);
canvastools::initRenderState(renderState);
sprite->getContentCanvas()->getUNOCanvas()->drawBitmap(mxIconBitmap, viewState,
renderState);
slideshow/source/engine/slideshowimpl.cxx
+4 -4
View File
@@ -144,7 +144,7 @@ private:
one used by SlideShowImpl: it is not paused or modified by
animations.
*/
canvas::tools::ElapsedTime maTimer;
canvastools::ElapsedTime maTimer;
/** Time between the display of frames. Enforced only when mbIsActive
is <TRUE/>.
*/
@@ -429,7 +429,7 @@ private:
std::optional<sal_Int32> maEraseInk;
//end changed
std::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer;
std::shared_ptr<canvastools::ElapsedTime> mpPresTimer;
ScreenUpdater maScreenUpdater;
EventQueue maEventQueue;
EventMultiplexer maEventMultiplexer;
@@ -561,7 +561,7 @@ SlideShowImpl::SlideShowImpl(
maShapeCursors(),
maUserPaintColor(),
maUserPaintStrokeWidth(4.0),
mpPresTimer( std::make_shared<canvas::tools::ElapsedTime>() ),
mpPresTimer( std::make_shared<canvastools::ElapsedTime>() ),
maScreenUpdater(maViewContainer),
maEventQueue( mpPresTimer ),
maEventMultiplexer( maEventQueue,
@@ -2116,7 +2116,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
//Get a shared-ptr that outlives the scope-guard which will
//ensure that the pointed-to-item exists in the case of a
//::dispose clearing mpPresTimer
std::shared_ptr<canvas::tools::ElapsedTime> xTimer(mpPresTimer);
std::shared_ptr<canvastools::ElapsedTime> xTimer(mpPresTimer);
comphelper::ScopeGuard scopeGuard(
[&xTimer]() { return xTimer->releaseTimer(); } );
xTimer->holdTimer();
slideshow/source/engine/slideview.cxx
+5 -5
View File
@@ -213,7 +213,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas,
basegfx::B2IRange getLayerBoundsPixel( basegfx::B2DRange const& rLayerBounds,
basegfx::B2DHomMatrix const& rTransformation )
{
::basegfx::B2DRange aTmpRect = ::canvas::tools::calcTransformedRectBounds(
::basegfx::B2DRange aTmpRect = ::canvastools::calcTransformedRectBounds(
rLayerBounds,
rTransformation );
@@ -463,7 +463,7 @@ public:
virtual css::geometry::IntegerSize2D getTranslationOffset() const override
{
basegfx::B2DRectangle aTmpRect = canvas::tools::calcTransformedRectBounds(
basegfx::B2DRectangle aTmpRect = canvastools::calcTransformedRectBounds(
maLayerBounds,
maTransformation );
geometry::IntegerSize2D offset(0, 0);
@@ -512,7 +512,7 @@ private:
{
// Offset given transformation by left, top border of given
// range (after transformation through given transformation)
basegfx::B2DRectangle aTmpRect = canvas::tools::calcTransformedRectBounds(
basegfx::B2DRectangle aTmpRect = canvastools::calcTransformedRectBounds(
maLayerBounds,
maTransformation );
@@ -774,7 +774,7 @@ SlideView::SlideView( const uno::Reference<presentation::XSlideShowView>& xView,
{
OSL_FAIL( "SlideView::SlideView(): Singular matrix!" );
canvas::tools::setIdentityAffineMatrix2D(aViewTransform);
canvastools::setIdentityAffineMatrix2D(aViewTransform);
}
basegfx::unotools::homMatrixFromAffineMatrix(
@@ -1058,7 +1058,7 @@ void SlideView::modified( const lang::EventObject& /*aEvent*/ )
{
OSL_FAIL( "SlideView::modified(): Singular matrix!" );
canvas::tools::setIdentityAffineMatrix2D(aViewTransform);
canvastools::setIdentityAffineMatrix2D(aViewTransform);
}
// view transformation really changed?
slideshow/source/engine/tools.cxx
+2 -2
View File
@@ -562,7 +562,7 @@ namespace slideshow::internal
aTransform *= rShapeTransform;
// apply shape transformation to unit rect
return ::canvas::tools::calcTransformedRectBounds(
return ::canvastools::calcTransformedRectBounds(
rUnitBounds,
aTransform );
}
@@ -761,7 +761,7 @@ namespace slideshow::internal
const basegfx::B2DRange aRect( 0,0,
rSlideSize.getX(),
rSlideSize.getY() );
basegfx::B2DRange aTmpRect = canvas::tools::calcTransformedRectBounds(
basegfx::B2DRange aTmpRect = canvastools::calcTransformedRectBounds(
aRect,
pView->getTransformation() );
slideshow/source/engine/waitsymbol.cxx
+2 -2
View File
@@ -117,9 +117,9 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView )
1000.0 ); // sprite should be in front of all
// other sprites
rendering::ViewState viewState;
canvas::tools::initViewState( viewState );
canvastools::initViewState( viewState );
rendering::RenderState renderState;
canvas::tools::initRenderState( renderState );
canvastools::initRenderState( renderState );
sprite->getContentCanvas()->getUNOCanvas()->drawBitmap(
mxBitmap, viewState, renderState );
slideshow/source/engine/wakeupevent.cxx
+1 -1
View File
@@ -27,7 +27,7 @@
namespace slideshow::internal
{
WakeupEvent::WakeupEvent(
std::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
std::shared_ptr<canvastools::ElapsedTime> const & pTimeBase,
ActivitiesQueue& rActivityQueue ) :
Event(u"WakeupEvent"_ustr),
maTimer(pTimeBase),
slideshow/source/inc/activitiesqueue.hxx
+3 -3
View File
@@ -48,7 +48,7 @@ namespace slideshow::internal
adjusting and holding global presentation time.
*/
explicit ActivitiesQueue(
std::shared_ptr< ::canvas::tools::ElapsedTime > pPresTimer );
std::shared_ptr< ::canvastools::ElapsedTime > pPresTimer );
~ActivitiesQueue();
ActivitiesQueue(const ActivitiesQueue&) = delete;
ActivitiesQueue& operator=(const ActivitiesQueue&) = delete;
@@ -85,11 +85,11 @@ namespace slideshow::internal
/** Gets the queue's timer object.
*/
std::shared_ptr< ::canvas::tools::ElapsedTime > const &
std::shared_ptr< ::canvastools::ElapsedTime > const &
getTimer() const { return mpTimer; }
private:
std::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer;
std::shared_ptr< ::canvastools::ElapsedTime > mpTimer;
typedef ::std::deque< ActivitySharedPtr > ActivityQueue;
slideshow/source/inc/eventqueue.hxx
+3 -3
View File
@@ -41,7 +41,7 @@ namespace slideshow::internal
{
public:
EventQueue(
std::shared_ptr< ::canvas::tools::ElapsedTime > pPresTimer );
std::shared_ptr< ::canvastools::ElapsedTime > pPresTimer );
~EventQueue();
@@ -112,7 +112,7 @@ namespace slideshow::internal
/** Gets the queue's timer object.
*/
std::shared_ptr< ::canvas::tools::ElapsedTime > const &
std::shared_ptr< ::canvastools::ElapsedTime > const &
getTimer() const { return mpTimer; }
private:
@@ -139,7 +139,7 @@ namespace slideshow::internal
// perform timing of events via relative time
// measurements. The world time starts, when the
// EventQueue object is created
std::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer;
std::shared_ptr< ::canvastools::ElapsedTime > mpTimer;
};
}
slideshow/source/inc/wakeupevent.hxx
+2 -2
View File
@@ -37,7 +37,7 @@ class WakeupEvent : public Event
{
public:
WakeupEvent(
std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
std::shared_ptr< ::canvastools::ElapsedTime > const& pTimeBase,
ActivitiesQueue & rActivityQueue );
WakeupEvent(const WakeupEvent&) = delete;
WakeupEvent& operator=(const WakeupEvent&) = delete;
@@ -68,7 +68,7 @@ public:
void setActivity( const ActivitySharedPtr& rActivity );
private:
::canvas::tools::ElapsedTime maTimer;
::canvastools::ElapsedTime maTimer;
double mnNextTime;
ActivitySharedPtr mpActivity;
ActivitiesQueue& mrActivityQueue;