Replaced Cascades 4 with Cascades

vize23 · Jun 29, 2012 · 205a03e · 205a03e
1 parent 1f07df4
commit 205a03e
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ simple instrument app. In this sample, a rotation animation is used to
 animate a bell hanging around the neck of a cow.
 _Handle rotation animations, Trigger C++ functions from QML, Use an AbsoluteLayout, Play a basic sound with OpenAL_
 
-**Hello Cascades:** This is a very basic Hello World application for Cascades 4.
+**Hello Cascades:** This is a very basic Hello World application for Cascades.
 _Add an image to the UI, Add text to the UI, Use layouts in QML_
 
 **HelloForeignWindow:** This is a an application that shows how to put a hole in a UI from Cascades to show you're 

diff --git a/cascadescookbookcpp/manifest.properties b/cascadescookbookcpp/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/cascadescookbookcpp/recipes/intro.h b/cascadescookbookcpp/recipes/intro.h
@@ -34,7 +34,7 @@ namespace bb
  *
  * The application introduction recipe. Sets up a view with some text
  * explaining the purpose of the application and a small example UI
- * showing a couple of Cascades 4 Core Controls.
+ * showing a couple of Cascades Core Controls.
  *
  */
 class Intro: public bb::cascades::CustomControl
@@ -47,7 +47,7 @@ Q_OBJECT
 private:
     /**
      * This function sets up a Container showcasing some of the Core Controls
-     * available in Cascades 4. A text area, Button, Slider and ToggleButton is
+     * available in Cascades. A text area, Button, Slider and ToggleButton is
      * added on top of a nice looking Background image.
      *
      * @return A Container with a small example UI.

diff --git a/cascadescookbookcpp/recipes/stockcurverecipe.h b/cascadescookbookcpp/recipes/stockcurverecipe.h
@@ -41,7 +41,7 @@ namespace bb
  * This recipe illustrates how the different preset easing curves,
  * "stock curves", effect the timing of the animation (stock in this
  * case being a collection and having nothing to do with the financial market).
- * In the recipe the curves predefined in Cascades 4 is presented in a radio
+ * In the recipe the curves predefined in Cascades is presented in a radio
  * button list to the right. When a new curve is selected an object will animated
  * using the animation curve so that you can see how the different curves behaves.
  */

diff --git a/cascadescookbookqml/assets/Intro.qml b/cascadescookbookqml/assets/Intro.qml
@@ -17,7 +17,7 @@ import "Common"
 
 // The application introduction recipe. Sets up a view with some text
 // explaining the purpose of the application and a small example UI
-// showing a couple of Cascades 4 Core Controls.
+// showing a couple of Cascades Core Controls.
 RecipePage {
     RecipeContainer {
         Container {

diff --git a/cascadescookbookqml/assets/IntroExampleUI.qml b/cascadescookbookqml/assets/IntroExampleUI.qml
@@ -15,7 +15,7 @@
 import bb.cascades 1.0
 
 // This QML Component is used by the intro recipe. It sets up a Container
-// showcasing some of the Core Controls available in Cascades 4. A text area,
+// showcasing some of the Core Controls available in Cascades. A text area,
 // Button, Slider and ToggleButton is added on top of a nice looking Background image.
 
 Container {

diff --git a/cascadescookbookqml/assets/Stockcurve.qml b/cascadescookbookqml/assets/Stockcurve.qml
@@ -18,7 +18,7 @@ import "Common"
 // This recipe illustrates how the different preset easing curves,
 // "stock curves", effect the timing of the animation (stock in this
 // case being a collection and has nothing to do with the financial market).
-// In the recipe the curves predefined in Cascades 4 is presented in a radio
+// In the recipe the curves predefined in Cascades is presented in a radio
 // button list to the right. When a new curve is selected an object will animated
 // using the animation curve so that you can see how the different curves behaves.
 

diff --git a/cascadescookbookqml/manifest.properties b/cascadescookbookqml/manifest.properties
@@ -40,7 +40,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/cowbell/manifest.properties b/cowbell/manifest.properties
@@ -39,7 +39,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/hellocascades/manifest.properties b/hellocascades/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/hellocascades/readme.txt b/hellocascades/readme.txt
@@ -3,7 +3,7 @@ HelloWorld - Text & Image
 ========================================================================
 Sample Description.
 
- This is a very basic Hello World application for Cascades 4.
+ This is a very basic Hello World application for Cascades.
 
  You will learn how to:
  - Add an image to the UI

diff --git a/hellocascades/src/hellocascadesapp.h b/hellocascades/src/hellocascadesapp.h
@@ -23,7 +23,7 @@
  * HelloWorld
  *
  * This sample application shows some of the very basic handling of
- * images and text in Cascades 4. Loading a QML for a simple hello
+ * images and text in Cascades. Loading a QML for a simple hello
  * world sample application containing to images and a "Hello World"
  * text.
  *

diff --git a/kakel/manifest.properties b/kakel/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/lightningcrossfadecpp/manifest.properties b/lightningcrossfadecpp/manifest.properties
@@ -39,7 +39,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/lightningcrossfadecpp/src/lightningcrossfadeapp.h b/lightningcrossfadecpp/src/lightningcrossfadeapp.h
@@ -32,7 +32,7 @@ namespace bb
 /**
  * LightningCrossfade
  *
- * This is basic Core-controls application for Cascades 4.
+ * This is basic Core-controls application for Cascades.
  *
  * Feature summary
  * - Adding an image to the UI

diff --git a/lightningcrossfadeqml/manifest.properties b/lightningcrossfadeqml/manifest.properties
@@ -39,7 +39,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/lightningcrossfadeqml/src/lightningcrossfadeapp.h b/lightningcrossfadeqml/src/lightningcrossfadeapp.h
@@ -22,7 +22,7 @@
 /**
  * LightningCrossfade
  *
- * This is basic Core-controls application for Cascades 4.
+ * This is basic Core-controls application for Cascades.
  *
  * Feature summary
  * - Adding an image to the UI

diff --git a/poemmaker/manifest.properties b/poemmaker/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/pullmybeard/manifest.properties b/pullmybeard/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/quotes/manifest.properties b/quotes/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/speedwriter/manifest.properties b/speedwriter/manifest.properties
@@ -37,7 +37,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/stampcollector/manifest.properties b/stampcollector/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/starshipsettings/manifest.properties b/starshipsettings/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/qt4 \
   $(QNX_TARGET)/usr/include/qt4/QtCore \

diff --git a/weatherguesser/manifest.properties b/weatherguesser/manifest.properties
@@ -38,7 +38,7 @@ flags.compiler: -fstack-protector-all -D_FORTIFY_SOURCE=2 -lang-c++
 desc.flags.linker: Linker options for enhanced security
 flags.linker: -Wl,-z,relro -Wl,-z,now
 
-desc.path.includes: Cascades 4 Native Includes
+desc.path.includes: Cascades Native Includes
 path.includes: $(QNX_TARGET)/../target-override/usr/include \
   $(QNX_TARGET)/usr/include/cpp \
   $(QNX_TARGET)/usr/include/cpp/c \