summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demo/dali-table-view.cpp1
-rw-r--r--examples/benchmark/benchmark.cpp4
-rw-r--r--examples/builder/examples.cpp7
-rw-r--r--examples/buttons/buttons-example.cpp1
-rw-r--r--examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp3
-rw-r--r--examples/image-view-svg/image-view-svg-example.cpp1
-rw-r--r--examples/magnifier/magnifier-example.cpp3
-rw-r--r--examples/metaball-refrac/metaball-refrac-example.cpp1
-rw-r--r--examples/motion-blur/motion-blur-example.cpp5
-rw-r--r--examples/motion-stretch/motion-stretch-example.cpp5
-rw-r--r--examples/new-window/new-window-example.cpp3
-rw-r--r--examples/perf-scroll/perf-scroll.cpp2
-rw-r--r--examples/styling/image-channel-control-impl.cpp1
-rw-r--r--examples/styling/styling-application.cpp3
-rw-r--r--examples/text-label-emojis/text-label-emojis.cpp5
-rw-r--r--examples/video-view/video-view-example.cpp5
16 files changed, 27 insertions, 23 deletions
diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index 1de6db94..09a03438 100644
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -226,6 +226,7 @@ DaliTableView::DaliTableView( Application& application )
mPages(),
mBackgroundAnimations(),
mExampleList(),
+ mPageWidth( 0.0f ),
mTotalPages(),
mScrolling( false ),
mSortAlphabetically( false ),
diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp
index 6d137fff..546e8e58 100644
--- a/examples/benchmark/benchmark.cpp
+++ b/examples/benchmark/benchmark.cpp
@@ -351,7 +351,7 @@ public:
float delay = 0.0f;
float duration = 0.0f;
- if( count < mRowsPerPage*mColumnsPerPage )
+ if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) )
{
duration = durationPerActor;
delay = delayBetweenActors * count;
@@ -385,7 +385,7 @@ public:
Vector3 stageSize( stage.GetSize() );
mScroll = Animation::New(10.0f);
- size_t actorCount( mRowsPerPage*mColumnsPerPage*mPageCount);
+ size_t actorCount( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage * mPageCount );
for( size_t i(0); i<actorCount; ++i )
{
if( gUseMesh )
diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index eded833b..2895d828 100644
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -558,15 +558,12 @@ private:
Toolkit::NavigationView mNavigationView;
Toolkit::Control mView;
- unsigned int mOrientation;
Toolkit::ToolBar mToolBar;
TextLabel mTitleActor;
Layer mBuilderLayer;
- Toolkit::Popup mMenu;
-
TapGestureDetector mTapDetector;
// builder
@@ -576,8 +573,6 @@ private:
FileWatcher mFileWatcher;
Timer mTimer;
-
-
};
//------------------------------------------------------------------------------
diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp
index 4e2b6d54..eddb106b 100644
--- a/examples/buttons/buttons-example.cpp
+++ b/examples/buttons/buttons-example.cpp
@@ -497,7 +497,6 @@ private:
Toolkit::CheckBoxButton mCheckboxButton3;
Animation mAnimation;
- float mLastPoint;
Toolkit::ImageView mImage;
};
diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index f13617a3..f5d17c6e 100644
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -152,6 +152,7 @@ public:
ImageScalingAndFilteringController( Application& application )
: mApplication( application ),
+ mLastPinchScale( 1.0f ),
mImageStageScale( 0.5f, 0.5f ),
mCurrentPath( 0 ),
mFittingMode( FittingMode::FIT_WIDTH ),
diff --git a/examples/image-view-svg/image-view-svg-example.cpp b/examples/image-view-svg/image-view-svg-example.cpp
index 12180f23..97ebeba2 100644
--- a/examples/image-view-svg/image-view-svg-example.cpp
+++ b/examples/image-view-svg/image-view-svg-example.cpp
@@ -47,6 +47,7 @@ public:
ImageSvgController( Application& application )
: mApplication( application ),
mScale( 1.f ),
+ mScaleAtPinchStart( 1.0f ),
mIndex( 0 )
{
// Connect to the Application's Init signal
diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp
index fb461b5c..2221bf18 100644
--- a/examples/magnifier/magnifier-example.cpp
+++ b/examples/magnifier/magnifier-example.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -173,6 +173,7 @@ public:
: mApplication( application ),
mView(),
mAnimationTime(0.0f),
+ mAnimationTimeProperty( Property::INVALID_INDEX ),
mMagnifierShown(false)
{
// Connect to the Application's Init signal
diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp
index 2c865048..d2f95f88 100644
--- a/examples/metaball-refrac/metaball-refrac-example.cpp
+++ b/examples/metaball-refrac/metaball-refrac-example.cpp
@@ -187,7 +187,6 @@ private:
Actor mCompositionActor;
//Motion
- bool mExitClick;
Vector2 mCurrentTouchPosition;
Vector2 mMetaballPosVariation;
Vector2 mMetaballPosVariationFrom;
diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp
index 74c11fc8..55605ba5 100644
--- a/examples/motion-blur/motion-blur-example.cpp
+++ b/examples/motion-blur/motion-blur-example.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -143,7 +143,8 @@ public:
: mApplication(app),
mActorEffectsEnabled(false),
mCurrentActorAnimation(0),
- mCurrentImage(0)
+ mCurrentImage(0),
+ mOrientation( PORTRAIT )
{
// Connect to the Application's Init signal
app.InitSignal().Connect(this, &MotionBlurExampleApp::OnInit);
diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp
index cdb631fc..43899073 100644
--- a/examples/motion-stretch/motion-stretch-example.cpp
+++ b/examples/motion-stretch/motion-stretch-example.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -110,7 +110,8 @@ public:
: mApplication(app),
mActorEffectsEnabled(false),
mCurrentActorAnimation(0),
- mCurrentImage(0)
+ mCurrentImage(0),
+ mOrientation( PORTRAIT )
{
// Connect to the Application's Init signal
app.InitSignal().Connect(this, &MotionStretchExampleApp::OnInit);
diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp
index 56b74f38..08dff101 100644
--- a/examples/new-window/new-window-example.cpp
+++ b/examples/new-window/new-window-example.cpp
@@ -164,7 +164,8 @@ private:
NewWindowController::NewWindowController( Application& application )
: mApplication(application),
- mNeedNewAnimation(true)
+ mNeedNewAnimation(true),
+ mAnimateComponentCount( 0 )
{
mApplication.InitSignal().Connect(this, &NewWindowController::Create);
mApplication.TerminateSignal().Connect(this, &NewWindowController::Destroy);
diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp
index ddfd9b83..3bfdda5b 100644
--- a/examples/perf-scroll/perf-scroll.cpp
+++ b/examples/perf-scroll/perf-scroll.cpp
@@ -354,7 +354,7 @@ public:
float delay = 0.0f;
float duration = 0.0f;
- if( count < mRowsPerPage*mColumnsPerPage )
+ if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) )
{
duration = durationPerActor;
delay = delayBetweenActors * count;
diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp
index 4672d7d1..6965a412 100644
--- a/examples/styling/image-channel-control-impl.cpp
+++ b/examples/styling/image-channel-control-impl.cpp
@@ -67,6 +67,7 @@ DALI_TYPE_REGISTRATION_END();
Internal::ImageChannelControl::ImageChannelControl()
: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
mChannels( 1.0f, 1.0f, 1.0f ),
+ mChannelIndex( Property::INVALID_INDEX ),
mVisibility(true),
mTargetVisibility(true)
{
diff --git a/examples/styling/styling-application.cpp b/examples/styling/styling-application.cpp
index a80a97b5..ffd0aaa1 100644
--- a/examples/styling/styling-application.cpp
+++ b/examples/styling/styling-application.cpp
@@ -92,7 +92,8 @@ Property::Index GetChannelProperty( int index )
StylingApplication::StylingApplication( Application& application )
-: mApplication( application )
+: mApplication( application ),
+ mCurrentTheme( 0 )
{
application.InitSignal().Connect( this, &StylingApplication::Create );
}
diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp
index f5415b28..8e13fff7 100644
--- a/examples/text-label-emojis/text-label-emojis.cpp
+++ b/examples/text-label-emojis/text-label-emojis.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,8 @@ public:
typedef uint32_t SizeType;
EmojiExample( Application& application )
- : mApplication( application )
+ : mApplication( application ),
+ mLastPoint( 0.0f )
{
std::cout << "EmoticonController::EmoticonController" << std::endl;
diff --git a/examples/video-view/video-view-example.cpp b/examples/video-view/video-view-example.cpp
index c20b8f81..cb29b8d9 100644
--- a/examples/video-view/video-view-example.cpp
+++ b/examples/video-view/video-view-example.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,7 +47,8 @@ class VideoViewController: public ConnectionTracker
mIsPlay( false ),
mIsStop( false ),
mIsFullScreen( false ),
- mScale( 1.f )
+ mScale( 1.f ),
+ mPinchStartScale( 1.0f )
{
// Connect to the Application's Init signal
mApplication.InitSignal().Connect( this, &VideoViewController::Create );
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 04:44:44 +0000