Skip to content

Commit

Permalink
Merge pull request #139 from CodeHoarder/master
Browse files Browse the repository at this point in the history 
added 2 new samples and fixed up copyright in cpp/qml files
  • Loading branch information
@pelegri
pelegri committed Aug 27, 2013
2 parents 181fdfd + 87bfc44 commit 449d610
Show file tree
Hide file tree
Showing 517 changed files with 3,586 additions and 685 deletions.
4 changes: 2 additions & 2 deletions SensorDemo/assets/collisiondetector.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import bb.multimedia 1.0
import QtMobility.sensors 1.2

Expand Down
4 changes: 2 additions & 2 deletions SensorDemo/assets/compass.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import QtMobility.sensors 1.2
import bb.vibrationController 1.0

Expand Down
4 changes: 2 additions & 2 deletions SensorDemo/assets/flashlight.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import QtMobility.sensors 1.2
import Flashlight 1.0

Expand Down
4 changes: 2 additions & 2 deletions SensorDemo/assets/main.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import QtMobility.sensors 1.2

TabbedPane {
Expand Down
4 changes: 2 additions & 2 deletions SensorDemo/assets/metalfinder.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import QtMobility.sensors 1.2
import bb.vibrationController 1.0

Expand Down
4 changes: 2 additions & 2 deletions SensorDemo/assets/motionalarm.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import bb.multimedia 1.0
import QtMobility.sensors 1.2

Expand Down
4 changes: 2 additions & 2 deletions SensorDemo/assets/rotation3D.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import bb.multimedia 1.0
import QtMobility.sensors 1.2

Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/src/Flashlight.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/src/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions accelgame/assets/Maze.qml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

Container {
// The size is defined by the background image
Expand Down
4 changes: 2 additions & 2 deletions accelgame/assets/main.qml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

Page {
onCreationCompleted: {
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/accelerationsensor.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/board.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/gamecontroller.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/player.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions accounts/assets/720x720/BackgroundImage.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

ImageView {
imageSource: "asset:///images/background.amd"
Expand Down
4 changes: 2 additions & 2 deletions accounts/assets/AccountEditor.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import com.example.bb10samples.pim.accounts 1.0

Page {
Expand Down
4 changes: 2 additions & 2 deletions accounts/assets/AccountViewer.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

Page {
id: root
Expand Down
4 changes: 2 additions & 2 deletions accounts/assets/BackgroundImage.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

ImageView {
imageSource: "asset:///images/background.png"
Expand Down
4 changes: 2 additions & 2 deletions accounts/assets/EditorField.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

//! [0]
Container {
Expand Down
4 changes: 2 additions & 2 deletions accounts/assets/ViewerField.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

Container {
property alias title: titleField.text
Expand Down
4 changes: 2 additions & 2 deletions accounts/assets/main.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

NavigationPane {
id: navigationPane
Expand Down
2 changes: 1 addition & 1 deletion accounts/src/AccountEditor.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accounts/src/AccountViewer.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accounts/src/Accounts.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accounts/src/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions addressbook/assets/720x720/AddressbookScrollView.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bb.cascades 1.2
import bb.cascades 1.0

// For the 720x720 resolution a ScrollView is used, for the standard
// resolution this would lead to rubberbanding of a full screen UI
Expand Down
4 changes: 2 additions & 2 deletions addressbook/assets/720x720/BackgroundImage.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

ImageView {
imageSource: "asset:///images/background.amd"
Expand Down
4 changes: 2 additions & 2 deletions addressbook/assets/AddressbookScrollView.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bb.cascades 1.2
import bb.cascades 1.0

// In the default resolution we do not add a scroll to the UI, since we do
// not want rubberbanding at the top and bottom. For a smaller screen this
Expand Down
4 changes: 2 additions & 2 deletions addressbook/assets/BackgroundImage.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0

ImageView {
imageSource: "asset:///images/background.png"
Expand Down
4 changes: 2 additions & 2 deletions addressbook/assets/ContactEditor.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.2
import bb.cascades 1.0
import com.example.bb10samples.pim.addressbook 1.0

Page {
Expand Down
Loading

0 comments on commit 449d610

Please sign in to comment.