Commit 56fcceb48527c03dc629c76aa6a2c8c6cf26d421
1 parent
46a7cce3
Fix various SVACE errors
Change-Id: I2dfed0e2863dfc4eecb3cb86d28968a76ba78836
Showing
16 changed files
with
27 additions
and
23 deletions
demo/dali-table-view.cpp
examples/benchmark/benchmark.cpp
| ... | ... | @@ -351,7 +351,7 @@ public: |
| 351 | 351 | |
| 352 | 352 | float delay = 0.0f; |
| 353 | 353 | float duration = 0.0f; |
| 354 | - if( count < mRowsPerPage*mColumnsPerPage ) | |
| 354 | + if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) ) | |
| 355 | 355 | { |
| 356 | 356 | duration = durationPerActor; |
| 357 | 357 | delay = delayBetweenActors * count; |
| ... | ... | @@ -385,7 +385,7 @@ public: |
| 385 | 385 | Vector3 stageSize( stage.GetSize() ); |
| 386 | 386 | |
| 387 | 387 | mScroll = Animation::New(10.0f); |
| 388 | - size_t actorCount( mRowsPerPage*mColumnsPerPage*mPageCount); | |
| 388 | + size_t actorCount( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage * mPageCount ); | |
| 389 | 389 | for( size_t i(0); i<actorCount; ++i ) |
| 390 | 390 | { |
| 391 | 391 | if( gUseMesh ) | ... | ... |
examples/builder/examples.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -558,15 +558,12 @@ private: |
| 558 | 558 | Toolkit::NavigationView mNavigationView; |
| 559 | 559 | |
| 560 | 560 | Toolkit::Control mView; |
| 561 | - unsigned int mOrientation; | |
| 562 | 561 | |
| 563 | 562 | Toolkit::ToolBar mToolBar; |
| 564 | 563 | TextLabel mTitleActor; |
| 565 | 564 | |
| 566 | 565 | Layer mBuilderLayer; |
| 567 | 566 | |
| 568 | - Toolkit::Popup mMenu; | |
| 569 | - | |
| 570 | 567 | TapGestureDetector mTapDetector; |
| 571 | 568 | |
| 572 | 569 | // builder |
| ... | ... | @@ -576,8 +573,6 @@ private: |
| 576 | 573 | |
| 577 | 574 | FileWatcher mFileWatcher; |
| 578 | 575 | Timer mTimer; |
| 579 | - | |
| 580 | - | |
| 581 | 576 | }; |
| 582 | 577 | |
| 583 | 578 | //------------------------------------------------------------------------------ | ... | ... |
examples/buttons/buttons-example.cpp
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -152,6 +152,7 @@ public: |
| 152 | 152 | |
| 153 | 153 | ImageScalingAndFilteringController( Application& application ) |
| 154 | 154 | : mApplication( application ), |
| 155 | + mLastPinchScale( 1.0f ), | |
| 155 | 156 | mImageStageScale( 0.5f, 0.5f ), |
| 156 | 157 | mCurrentPath( 0 ), |
| 157 | 158 | mFittingMode( FittingMode::FIT_WIDTH ), | ... | ... |
examples/image-view-svg/image-view-svg-example.cpp
examples/magnifier/magnifier-example.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -173,6 +173,7 @@ public: |
| 173 | 173 | : mApplication( application ), |
| 174 | 174 | mView(), |
| 175 | 175 | mAnimationTime(0.0f), |
| 176 | + mAnimationTimeProperty( Property::INVALID_INDEX ), | |
| 176 | 177 | mMagnifierShown(false) |
| 177 | 178 | { |
| 178 | 179 | // Connect to the Application's Init signal | ... | ... |
examples/metaball-refrac/metaball-refrac-example.cpp
examples/motion-blur/motion-blur-example.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -143,7 +143,8 @@ public: |
| 143 | 143 | : mApplication(app), |
| 144 | 144 | mActorEffectsEnabled(false), |
| 145 | 145 | mCurrentActorAnimation(0), |
| 146 | - mCurrentImage(0) | |
| 146 | + mCurrentImage(0), | |
| 147 | + mOrientation( PORTRAIT ) | |
| 147 | 148 | { |
| 148 | 149 | // Connect to the Application's Init signal |
| 149 | 150 | app.InitSignal().Connect(this, &MotionBlurExampleApp::OnInit); | ... | ... |
examples/motion-stretch/motion-stretch-example.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -110,7 +110,8 @@ public: |
| 110 | 110 | : mApplication(app), |
| 111 | 111 | mActorEffectsEnabled(false), |
| 112 | 112 | mCurrentActorAnimation(0), |
| 113 | - mCurrentImage(0) | |
| 113 | + mCurrentImage(0), | |
| 114 | + mOrientation( PORTRAIT ) | |
| 114 | 115 | { |
| 115 | 116 | // Connect to the Application's Init signal |
| 116 | 117 | app.InitSignal().Connect(this, &MotionStretchExampleApp::OnInit); | ... | ... |
examples/new-window/new-window-example.cpp
| ... | ... | @@ -164,7 +164,8 @@ private: |
| 164 | 164 | |
| 165 | 165 | NewWindowController::NewWindowController( Application& application ) |
| 166 | 166 | : mApplication(application), |
| 167 | - mNeedNewAnimation(true) | |
| 167 | + mNeedNewAnimation(true), | |
| 168 | + mAnimateComponentCount( 0 ) | |
| 168 | 169 | { |
| 169 | 170 | mApplication.InitSignal().Connect(this, &NewWindowController::Create); |
| 170 | 171 | mApplication.TerminateSignal().Connect(this, &NewWindowController::Destroy); | ... | ... |
examples/perf-scroll/perf-scroll.cpp
| ... | ... | @@ -354,7 +354,7 @@ public: |
| 354 | 354 | |
| 355 | 355 | float delay = 0.0f; |
| 356 | 356 | float duration = 0.0f; |
| 357 | - if( count < mRowsPerPage*mColumnsPerPage ) | |
| 357 | + if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) ) | |
| 358 | 358 | { |
| 359 | 359 | duration = durationPerActor; |
| 360 | 360 | delay = delayBetweenActors * count; | ... | ... |
examples/styling/image-channel-control-impl.cpp
| ... | ... | @@ -67,6 +67,7 @@ DALI_TYPE_REGISTRATION_END(); |
| 67 | 67 | Internal::ImageChannelControl::ImageChannelControl() |
| 68 | 68 | : Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), |
| 69 | 69 | mChannels( 1.0f, 1.0f, 1.0f ), |
| 70 | + mChannelIndex( Property::INVALID_INDEX ), | |
| 70 | 71 | mVisibility(true), |
| 71 | 72 | mTargetVisibility(true) |
| 72 | 73 | { | ... | ... |
examples/styling/styling-application.cpp
| ... | ... | @@ -92,7 +92,8 @@ Property::Index GetChannelProperty( int index ) |
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | StylingApplication::StylingApplication( Application& application ) |
| 95 | -: mApplication( application ) | |
| 95 | +: mApplication( application ), | |
| 96 | + mCurrentTheme( 0 ) | |
| 96 | 97 | { |
| 97 | 98 | application.InitSignal().Connect( this, &StylingApplication::Create ); |
| 98 | 99 | } | ... | ... |
examples/text-label-emojis/text-label-emojis.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2015 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -38,7 +38,8 @@ public: |
| 38 | 38 | typedef uint32_t SizeType; |
| 39 | 39 | |
| 40 | 40 | EmojiExample( Application& application ) |
| 41 | - : mApplication( application ) | |
| 41 | + : mApplication( application ), | |
| 42 | + mLastPoint( 0.0f ) | |
| 42 | 43 | { |
| 43 | 44 | std::cout << "EmoticonController::EmoticonController" << std::endl; |
| 44 | 45 | ... | ... |
examples/video-view/video-view-example.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2015 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -47,7 +47,8 @@ class VideoViewController: public ConnectionTracker |
| 47 | 47 | mIsPlay( false ), |
| 48 | 48 | mIsStop( false ), |
| 49 | 49 | mIsFullScreen( false ), |
| 50 | - mScale( 1.f ) | |
| 50 | + mScale( 1.f ), | |
| 51 | + mPinchStartScale( 1.0f ) | |
| 51 | 52 | { |
| 52 | 53 | // Connect to the Application's Init signal |
| 53 | 54 | mApplication.InitSignal().Connect( this, &VideoViewController::Create ); | ... | ... |