Merge pull request #4 from smacmartin/spelling

Fix some spelling
gorepavan · May 21, 2012 · 89a824a · 89a824a
2 parents bf7d42d + 281b28b
commit 89a824a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/cowbell/assets/cowbell.qml b/cowbell/assets/cowbell.qml
@@ -104,10 +104,10 @@ Page {
                         // If the image is hit on the left side swing it to the right.
                         if (event.screenX < bell.layoutProperties.positionX + preferredWidth / 2) {                        
 
-                            // First check i an other animation is already running on the bell.
+                            // First check if another animation is already running on the bell.
                             trigLeft = checkPlayingAnimations ();
 
-                            // If no animaiton was running play it, otherwise we have to wait until
+                            // If no animation was running, play it. Otherwise we have to wait until
                             // onStopped to avoid conflicting animations. 
                             if (trigLeft == false) {
                                 animLeft.play ();

diff --git a/hellocascades/assets/hellocascades.qml b/hellocascades/assets/hellocascades.qml
@@ -24,14 +24,13 @@ Page {
         }
 
         // Here we create a background ImageView and set its source and size.
-        // As you see the images widht and height is set to the largest area it could possilby occupy. This 
+        // As you see the images width and height is set to the largest area it could possibly occupy. This 
         // will make the image stretch since it it's not that size in actual pixels. The reason for setting 
         // the size to this is so that the image will take the whole screen both in portraint and landscape.
         // For this image it will not look strange, but for other type of pixel content it could very 
         // well look mighty strange.
         ImageView {
             imageSource: "asset:///images/background.png"
-
             layoutProperties: DockLayoutProperties {
                 verticalAlignment: VerticalAlignment.Fill
                 horizontalAlignment: HorizontalAlignment.Fill
@@ -77,4 +76,4 @@ Page {
             }
         }
     }
-}
+}
diff --git a/helloforeignwindow/src/helloforeignwindowapp.cpp b/helloforeignwindow/src/helloforeignwindowapp.cpp
@@ -218,13 +218,12 @@ void HelloForeignWindowApp::initForeignWindow() {
 
      AbsoluteLayoutProperties *layoutProperties =
              dynamic_cast<AbsoluteLayoutProperties*>(foreignWindow->layoutProperties());
-
      // Set up the foreign window at the position specified by its LayoutProperties and the dimensions
      // given by its preferred width and height.
      if(createForeignWindow(ForeignWindow::mainWindowGroupId(), "HelloForeignWindowAppID",
              (int) layoutProperties->positionX(), (int) layoutProperties->positionY(),
              (int) foreignWindow->preferredWidth(), (int) foreignWindow->preferredHeight()) == false) {
-         qWarning() << "The ForeginWindow was not properly initialized";
+         qWarning() << "The ForeignWindow was not properly initialized";
      }
 
      // Initialization of the window has been performed.

diff --git a/stampcollector/assets/ContentPage.qml b/stampcollector/assets/ContentPage.qml
@@ -39,7 +39,7 @@ Page {
                 }
             }
 
-            // Desciptive text, will be replaced in code, by setting the _contentView.infoText property.
+            // Descriptive text, will be replaced in code, by setting the _contentView.infoText property.
             TextArea {                
                 topMargin: 30
                 preferredHeight: 200