aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode
diff options
context:
space:
mode:
authorGravatar Ruiqi Mao <ruiqimao@google.com>2018-06-21 14:40:28 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-22 20:36:17 +0000
commitc5c3df66430aafcc9bbe9335292a274066d2a611 (patch)
tree9653aef7ff82cc8064b5c4569ff9dbdf951ccad7 /samplecode
parent0bdd1b1003070ba51e2e18a0b6f52778ed99e3a5 (diff)
renamed samplecode/Nima to samplecode/SampleNimaActor
Bug: skia: Change-Id: I305ca837d5ed35df4b519e7283201f0a0f87b1c3 Reviewed-on: https://skia-review.googlesource.com/136636 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/SampleNima.cpp2
-rw-r--r--samplecode/SampleNimaActor.cpp (renamed from samplecode/Nima.cpp)2
-rw-r--r--samplecode/SampleNimaActor.h (renamed from samplecode/Nima.h)4
3 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleNima.cpp b/samplecode/SampleNima.cpp
index 3f0caa9d9d..f7bee1bb3b 100644
--- a/samplecode/SampleNima.cpp
+++ b/samplecode/SampleNima.cpp
@@ -6,7 +6,7 @@
*/
#include "SampleCode.h"
-#include "Nima.h"
+#include "SampleNimaActor.h"
#include "SkAnimTimer.h"
#include "SkView.h"
#include <nima/Animation/ActorAnimationInstance.hpp>
diff --git a/samplecode/Nima.cpp b/samplecode/SampleNimaActor.cpp
index 047eec7ca4..4634a45199 100644
--- a/samplecode/Nima.cpp
+++ b/samplecode/SampleNimaActor.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "Nima.h"
+#include "SampleNimaActor.h"
#include "SkString.h"
#include "SkVertices.h"
diff --git a/samplecode/Nima.h b/samplecode/SampleNimaActor.h
index 0017fcf59c..f2a136a2f6 100644
--- a/samplecode/Nima.h
+++ b/samplecode/SampleNimaActor.h
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#ifndef Nima_DEFINED
-#define Nima_DEFINED
+#ifndef SampleNimaActor_DEFINED
+#define SampleNimaActor_DEFINED
#include <nima/Actor.hpp>
#include <nima/ActorImage.hpp>