From 973a4086d7a832398997f0c3f0705582e437f596 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 27 Oct 2015 15:40:24 +0200 Subject: Remove initial :: from sal_* types Change-Id: Idcdc9aeb7d3fdca0a9db43c1cb518ab1d1b2f0f4 --- .../OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 36 +++++++++++----------- .../OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 16 +++++----- .../OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 34 ++++++++++---------- 3 files changed, 43 insertions(+), 43 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 8a572f328780..1cb003d2250e 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -71,7 +71,7 @@ void OGLTransitionImpl::setScene(TransitionScene const& rScene) maScene = rScene; } -void OGLTransitionImpl::prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ) +void OGLTransitionImpl::prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) { const SceneObjects_t& rSceneObjects(maScene.getSceneObjects()); for(size_t i(0); i != rSceneObjects.size(); ++i) { @@ -146,7 +146,7 @@ void OGLTransitionImpl::finish( double, double, double, double, double ) { } -void OGLTransitionImpl::prepareTransition( ::sal_Int32, ::sal_Int32 ) +void OGLTransitionImpl::prepareTransition( sal_Int32, sal_Int32 ) { } @@ -154,7 +154,7 @@ void OGLTransitionImpl::finishTransition() { } -void OGLTransitionImpl::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) +void OGLTransitionImpl::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) { CHECK_GL_ERROR(); applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale ); @@ -164,7 +164,7 @@ void OGLTransitionImpl::displaySlides_( double nTime, ::sal_Int32 glLeavingSlide displaySlide( nTime, glEnteringSlideTex, maScene.getEnteringSlide(), SlideWidthScale, SlideHeightScale ); } -void OGLTransitionImpl::display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, +void OGLTransitionImpl::display( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) { const double SlideWidthScale = SlideWidth/DispWidth; @@ -194,7 +194,7 @@ void OGLTransitionImpl::applyOverallOperations( double nTime, double SlideWidthS void OGLTransitionImpl::displaySlide( const double nTime, - const ::sal_Int32 glSlideTex, const Primitives_t& primitives, + const sal_Int32 glSlideTex, const Primitives_t& primitives, double SlideWidthScale, double SlideHeightScale ) { CHECK_GL_ERROR(); @@ -607,10 +607,10 @@ public: {} private: - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; + virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; }; -void RochadeTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) +void RochadeTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) { applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale ); @@ -688,7 +688,7 @@ T clamp(const T& rIn) return glm::clamp(rIn, T(-1.0), T(1.0)); } -std::shared_ptr makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles ) +std::shared_ptr makeRevolvingCircles( sal_uInt16 nCircles , sal_uInt16 nPointsOnCircles ) { double dAngle(2*3.1415926/static_cast( nPointsOnCircles )); if(nCircles < 2 || nPointsOnCircles < 4) @@ -803,7 +803,7 @@ std::shared_ptr makeRevolvingCircles( ::sal_uInt16 nCircles , return makeSimpleTransition(aLeavingSlide, aEnteringSlide); } -std::shared_ptr makeHelix( ::sal_uInt16 nRows ) +std::shared_ptr makeHelix( sal_uInt16 nRows ) { double invN(1.0/static_cast(nRows)); double iDn = 0.0; @@ -835,7 +835,7 @@ std::shared_ptr makeHelix( ::sal_uInt16 nRows ) return makeSimpleTransition(aLeavingSlide, aEnteringSlide); } -std::shared_ptr makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m ) +std::shared_ptr makeNByMTileFlip( sal_uInt16 n, sal_uInt16 m ) { double invN(1.0/static_cast(n)); double invM(1.0/static_cast(m)); @@ -1233,10 +1233,10 @@ public: {} private: - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; + virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; }; -void FadeSmoothlyTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) +void FadeSmoothlyTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) { CHECK_GL_ERROR(); applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale ); @@ -1314,10 +1314,10 @@ public: {} private: - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; + virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; }; -void FadeThroughBlackTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) +void FadeThroughBlackTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) { CHECK_GL_ERROR(); applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale ); @@ -1387,8 +1387,8 @@ protected: {} private: - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; - virtual void prepareTransition( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ) override; + virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; + virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override; virtual void finishTransition() override; virtual GLuint makeShader() = 0; @@ -1403,7 +1403,7 @@ private: GLuint m_nHelperTexture; }; -void ShaderTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, +void ShaderTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) { CHECK_GL_ERROR(); @@ -1424,7 +1424,7 @@ void ShaderTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideT CHECK_GL_ERROR(); } -void ShaderTransition::prepareTransition( ::sal_Int32 /* glLeavingSlideTex */, ::sal_Int32 /* glEnteringSlideTex */ ) +void ShaderTransition::prepareTransition( sal_Int32 /* glLeavingSlideTex */, sal_Int32 /* glEnteringSlideTex */ ) { m_nProgramObject = makeShader(); diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx index 772f2bf20db8..a9e4791f439c 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx @@ -149,10 +149,10 @@ public: /** Prepare transition. */ - void prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); + void prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ); /** Display a step of the transition. */ - void display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); + void display( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); /** Clean up after transition. */ void finish(); @@ -178,7 +178,7 @@ protected: void setScene(TransitionScene const& rScene); // void setSettings(TransitionSettings const& rSettings); - void displaySlide( double nTime, ::sal_Int32 glSlideTex, const Primitives_t& primitives, double SlideWidthScale, double SlideHeightScale ); + void displaySlide( double nTime, sal_Int32 glSlideTex, const Primitives_t& primitives, double SlideWidthScale, double SlideHeightScale ); void displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight); void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale ); @@ -199,7 +199,7 @@ private: * * Default implementation does nothing. */ - virtual void prepareTransition( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); + virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ); /** This function is called when the transition needs to clear after itself, like delete own textures etc. * @@ -212,7 +212,7 @@ private: * Default implementation applies overall operations and then * displays both slides. */ - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ); + virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ); private: TransitionScene maScene; @@ -223,9 +223,9 @@ private: // "Constructors" of available transitions std::shared_ptr makeOutsideCubeFaceToLeft(); std::shared_ptr makeInsideCubeFaceToLeft(); -std::shared_ptr makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m ); -std::shared_ptr makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles ); -std::shared_ptr makeHelix( ::sal_uInt16 nRows ); +std::shared_ptr makeNByMTileFlip( sal_uInt16 n, sal_uInt16 m ); +std::shared_ptr makeRevolvingCircles( sal_uInt16 nCircles , sal_uInt16 nPointsOnCircles ); +std::shared_ptr makeHelix( sal_uInt16 nRows ); std::shared_ptr makeFallLeaving(); std::shared_ptr makeTurnAround(); std::shared_ptr makeTurnDown(); diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index fe96fd58ef24..691e504e2a74 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -606,15 +606,15 @@ namespace uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override { return rendering::RenderingIntent::PERCEPTUAL; } @@ -736,19 +736,19 @@ namespace } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override { return util::Endianness::LITTLE; } - virtual uno::Sequence SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, + virtual uno::Sequence SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< sal_Int8 >& deviceColor, const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { @@ -780,7 +780,7 @@ namespace return targetColorSpace->convertFromARGB(aIntermediate); } } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, + virtual uno::Sequence< sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< sal_Int8 >& deviceColor, const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { @@ -798,7 +798,7 @@ namespace return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -819,7 +819,7 @@ namespace return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -841,7 +841,7 @@ namespace return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -864,7 +864,7 @@ namespace return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -882,7 +882,7 @@ namespace return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -900,7 +900,7 @@ namespace return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -1406,7 +1406,7 @@ public: {} // XTransitionFactory - virtual sal_Bool SAL_CALL hasTransition( ::sal_Int16 transitionType, ::sal_Int16 transitionSubType ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasTransition( sal_Int16 transitionType, sal_Int16 transitionSubType ) throw (uno::RuntimeException, std::exception) override { // A set of css::animation::TransitionSubType that don't have any meaning (in the SMIL 2.0 // standard) for MISCSHAPEWIPE have been chosen to refer to some of these "fancy" optional @@ -1451,8 +1451,8 @@ public: } virtual uno::Reference< presentation::XTransition > SAL_CALL createTransition( - ::sal_Int16 transitionType, - ::sal_Int16 transitionSubType, + sal_Int16 transitionType, + sal_Int16 transitionSubType, const uno::Reference< presentation::XSlideShowView >& view, const uno::Reference< rendering::XBitmap >& leavingBitmap, const uno::Reference< rendering::XBitmap >& enteringBitmap ) -- cgit