slideshow/source/engine/animationnodes/animationbasenode.hxx | 2 +-
slideshow/source/engine/animationnodes/animationcolornode.hxx | 2 +-
slideshow/source/engine/animationnodes/animationpathmotionnode.hxx | 2 +-
slideshow/source/engine/animationnodes/animationsetnode.hxx | 2 +-
slideshow/source/engine/animationnodes/animationtransformnode.hxx | 2 +-
slideshow/source/engine/animationnodes/basecontainernode.cxx | 4 ++--
slideshow/source/engine/animationnodes/basecontainernode.hxx | 4 ++--
slideshow/source/engine/animationnodes/basenode.cxx | 6
+++---
slideshow/source/engine/animationnodes/paralleltimecontainer.hxx | 2 +-
slideshow/source/engine/animationnodes/propertyanimationnode.hxx | 2 +-
slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 28564f96e88e7204a5d2119297d5865354942438
Author: Noel Grandin <n...@peralex.com>
Date: Tue Aug 11 09:30:00 2015 +0200
loplugin:cstylecast
Change-Id: Ie44d7b031b16647457cf08dc944526c720360f9d
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx
b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index 909c9f6..95e9ef1 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -181,9 +181,9 @@ void BaseContainerNode::showState() const
boost::dynamic_pointer_cast<BaseNode>(maChildren[i]);
SAL_INFO("slideshow.verbose",
"Node connection: n" <<
- (const char*)this+debugGetCurrentOffset() <<
+ reinterpret_cast<const char*>(this)+debugGetCurrentOffset() <<
" -> n" <<
- (const char*)pNode.get()+debugGetCurrentOffset() );
+ reinterpret_cast<const
char*>(pNode.get())+debugGetCurrentOffset() );
pNode->showState();
}
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx
b/slideshow/source/engine/animationnodes/basenode.cxx
index 9c857c0..6b6f62d 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -683,13 +683,13 @@ void BaseNode::showState() const
if( eNodeState == AnimationNode::INVALID )
SAL_INFO("slideshow.verbose", "Node state: n" <<
- (const char*)this+debugGetCurrentOffset() <<
+ reinterpret_cast<const char*>(this)+debugGetCurrentOffset() <<
" [label=\"" <<
getDescription() <<
"\",style=filled, fillcolor=\"0.5,0.2,0.5\"]");
else
SAL_INFO("slideshow.verbose", "Node state: n" <<
- (const char*)this+debugGetCurrentOffset() <<
+ reinterpret_cast<const char*>(this)+debugGetCurrentOffset() <<
" [label=\"" <<
getDescription() <<
"fillcolor=\"" <<
@@ -725,7 +725,7 @@ void BaseNode::showState() const
>>= aName) )
{
SAL_INFO("slideshow.verbose", "Node info: n" <<
- (const char*)this+debugGetCurrentOffset() <<
+ reinterpret_cast<const
char*>(this)+debugGetCurrentOffset() <<
", name \"" <<
aName <<
"\"");
commit 7151a2a9ca056d398ce3de6c0b48c3df7623f6e0
Author: Noel Grandin <n...@peralex.com>
Date: Tue Aug 11 09:25:53 2015 +0200
-Werror,-Winconsistent-missing-override
Change-Id: I3597b5d5cd54e6ff5398bdb5075b9fa03f9b5819
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx
b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index b2fa181..eef75d0 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -45,7 +45,7 @@ public:
NodeContext const& rContext );
#if defined(DBG_UTIL)
- virtual void showState() const;
+ virtual void showState() const SAL_OVERRIDE;
#endif
protected:
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx
b/slideshow/source/engine/animationnodes/animationcolornode.hxx
index fe8cb39..5e37bda 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx
@@ -38,7 +38,7 @@ public:
mxColorNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const { return "AnimationColorNode"; }
+ virtual const char* getDescription() const SAL_OVERRIDE { return
"AnimationColorNode"; }
#endif
private:
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
index e300720..4393030 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
@@ -37,7 +37,7 @@ public:
mxPathMotionNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const
+ virtual const char* getDescription() const SAL_OVERRIDE
{ return "AnimationPathMotionNode"; }
#endif
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx
b/slideshow/source/engine/animationnodes/animationsetnode.hxx
index 34c8668..20e41f4 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx
@@ -35,7 +35,7 @@ public:
: AnimationBaseNode( xNode, pParent, rContext ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const { return "AnimationSetNode"; }
+ virtual const char* getDescription() const SAL_OVERRIDE { return
"AnimationSetNode"; }
#endif
private:
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx
b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
index 24d0fbe..f942ec7 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
@@ -38,7 +38,7 @@ public:
mxTransformNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const
+ virtual const char* getDescription() const SAL_OVERRIDE
{ return "AnimationTransformNode"; }
#endif
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx
b/slideshow/source/engine/animationnodes/basecontainernode.hxx
index de351ed..cdefda1 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.hxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx
@@ -41,8 +41,8 @@ public:
void appendChildNode( AnimationNodeSharedPtr const& pNode );
#if defined(DBG_UTIL)
- virtual void showState() const;
- virtual const char* getDescription() const { return "BaseContainerNode"; }
+ virtual void showState() const SAL_OVERRIDE;
+ virtual const char* getDescription() const SAL_OVERRIDE { return
"BaseContainerNode"; }
#endif
protected:
diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
index ddc5c18..afda437 100644
--- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
@@ -39,7 +39,7 @@ public:
: BaseContainerNode( xNode, rParent, rContext ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const
+ virtual const char* getDescription() const SAL_OVERRIDE
{ return "ParallelTimeContainer"; }
#endif
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
index 41a5101..1ada4d2 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
@@ -35,7 +35,7 @@ public:
: AnimationBaseNode( xNode, pParent, rContext ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const
+ virtual const char* getDescription() const SAL_OVERRIDE
{ return "PropertyAnimationNode"; }
#endif
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index 7eb281c..bf1e306 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -39,7 +39,7 @@ public:
: BaseContainerNode( xNode, pParent, rContext ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const
+ virtual const char* getDescription() const SAL_OVERRIDE
{ return "SequentialTimeContainer"; }
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
