Adhere to examples standards more consistently

Example subfolders should be named 'content'

Change-Id: I23f5b0ef44108f54f9b1703f04faf02cafc78efb
Reviewed-by: Martin Jones <martin.jones@nokia.com>

diff --git a/examples/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml
index d447822..80f90f5 100644 (file)
--- a/examples/declarative/calculator/calculator.qml
+++ b/examples/declarative/calculator/calculator.qml
@@ -41,8 +41,8 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import "Core"
-import "Core/calculator.js" as CalcEngine
+import "content"
+import "content/calculator.js" as CalcEngine
 
 Rectangle {
     id: window

diff --git a/examples/declarative/calculator/Core/Button.qml b/examples/declarative/calculator/content/Button.qml
similarity index 100%
rename from examples/declarative/calculator/Core/Button.qml
rename to examples/declarative/calculator/content/Button.qml

diff --git a/examples/declarative/calculator/Core/Display.qml b/examples/declarative/calculator/content/Display.qml
similarity index 100%
rename from examples/declarative/calculator/Core/Display.qml
rename to examples/declarative/calculator/content/Display.qml

diff --git a/examples/declarative/calculator/Core/calculator.js b/examples/declarative/calculator/content/calculator.js
similarity index 100%
rename from examples/declarative/calculator/Core/calculator.js
rename to examples/declarative/calculator/content/calculator.js

diff --git a/examples/declarative/calculator/Core/images/button-.png b/examples/declarative/calculator/content/images/button-.png
similarity index 100%
rename from examples/declarative/calculator/Core/images/button-.png
rename to examples/declarative/calculator/content/images/button-.png

diff --git a/examples/declarative/calculator/Core/images/button-blue.png b/examples/declarative/calculator/content/images/button-blue.png
similarity index 100%
rename from examples/declarative/calculator/Core/images/button-blue.png
rename to examples/declarative/calculator/content/images/button-blue.png

diff --git a/examples/declarative/calculator/Core/images/button-green.png b/examples/declarative/calculator/content/images/button-green.png
similarity index 100%
rename from examples/declarative/calculator/Core/images/button-green.png
rename to examples/declarative/calculator/content/images/button-green.png

diff --git a/examples/declarative/calculator/Core/images/button-purple.png b/examples/declarative/calculator/content/images/button-purple.png
similarity index 100%
rename from examples/declarative/calculator/Core/images/button-purple.png
rename to examples/declarative/calculator/content/images/button-purple.png

diff --git a/examples/declarative/calculator/Core/images/button-red.png b/examples/declarative/calculator/content/images/button-red.png
similarity index 100%
rename from examples/declarative/calculator/Core/images/button-red.png
rename to examples/declarative/calculator/content/images/button-red.png

diff --git a/examples/declarative/calculator/Core/images/display.png b/examples/declarative/calculator/content/images/display.png
similarity index 100%
rename from examples/declarative/calculator/Core/images/display.png
rename to examples/declarative/calculator/content/images/display.png

diff --git a/examples/declarative/calculator/Core/qmldir b/examples/declarative/calculator/content/qmldir
similarity index 100%
rename from examples/declarative/calculator/Core/qmldir
rename to examples/declarative/calculator/content/qmldir

diff --git a/examples/declarative/samegame/SamegameCore/BoomBlock.qml b/examples/declarative/samegame/content/BoomBlock.qml
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/BoomBlock.qml
rename to examples/declarative/samegame/content/BoomBlock.qml

diff --git a/examples/declarative/samegame/SamegameCore/Button.qml b/examples/declarative/samegame/content/Button.qml
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/Button.qml
rename to examples/declarative/samegame/content/Button.qml

diff --git a/examples/declarative/samegame/SamegameCore/Dialog.qml b/examples/declarative/samegame/content/Dialog.qml
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/Dialog.qml
rename to examples/declarative/samegame/content/Dialog.qml

diff --git a/examples/declarative/samegame/SamegameCore/GameArea.qml b/examples/declarative/samegame/content/GameArea.qml
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/GameArea.qml
rename to examples/declarative/samegame/content/GameArea.qml

diff --git a/examples/declarative/samegame/SamegameCore/NameInputDialog.qml b/examples/declarative/samegame/content/NameInputDialog.qml
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/NameInputDialog.qml
rename to examples/declarative/samegame/content/NameInputDialog.qml

diff --git a/examples/declarative/samegame/SamegameCore/pics/background.png b/examples/declarative/samegame/content/pics/background.png
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/pics/background.png
rename to examples/declarative/samegame/content/pics/background.png

diff --git a/examples/declarative/samegame/SamegameCore/pics/blueStone.png b/examples/declarative/samegame/content/pics/blueStone.png
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/pics/blueStone.png
rename to examples/declarative/samegame/content/pics/blueStone.png

diff --git a/examples/declarative/samegame/SamegameCore/pics/greenStone.png b/examples/declarative/samegame/content/pics/greenStone.png
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/pics/greenStone.png
rename to examples/declarative/samegame/content/pics/greenStone.png

diff --git a/examples/declarative/samegame/SamegameCore/pics/particle.png b/examples/declarative/samegame/content/pics/particle.png
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/pics/particle.png
rename to examples/declarative/samegame/content/pics/particle.png

diff --git a/examples/declarative/samegame/SamegameCore/pics/redStone.png b/examples/declarative/samegame/content/pics/redStone.png
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/pics/redStone.png
rename to examples/declarative/samegame/content/pics/redStone.png

diff --git a/examples/declarative/samegame/SamegameCore/pics/yellowStone.png b/examples/declarative/samegame/content/pics/yellowStone.png
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/pics/yellowStone.png
rename to examples/declarative/samegame/content/pics/yellowStone.png

diff --git a/examples/declarative/samegame/SamegameCore/samegame.js b/examples/declarative/samegame/content/samegame.js
similarity index 100%
rename from examples/declarative/samegame/SamegameCore/samegame.js
rename to examples/declarative/samegame/content/samegame.js

diff --git a/examples/declarative/samegame/samegame.qml b/examples/declarative/samegame/samegame.qml
index 43e956b..8617a6b 100644 (file)
--- a/examples/declarative/samegame/samegame.qml
+++ b/examples/declarative/samegame/samegame.qml
@@ -41,8 +41,8 @@
 
 import QtQuick 2.0
 import QtQuick.Particles 2.0
-import "SamegameCore"
-import "SamegameCore/samegame.js" as Logic
+import "content"
+import "content/samegame.js" as Logic
 
 Rectangle {
     id: screen