diff --git a/SensorDemo/assets/collisiondetector.qml b/SensorDemo/assets/collisiondetector.qml index 63de82e1..675ae6d4 100644 --- a/SensorDemo/assets/collisiondetector.qml +++ b/SensorDemo/assets/collisiondetector.qml @@ -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 diff --git a/SensorDemo/assets/compass.qml b/SensorDemo/assets/compass.qml index 85241544..da16e023 100644 --- a/SensorDemo/assets/compass.qml +++ b/SensorDemo/assets/compass.qml @@ -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 diff --git a/SensorDemo/assets/flashlight.qml b/SensorDemo/assets/flashlight.qml index 50c742ca..fb4b7f1e 100644 --- a/SensorDemo/assets/flashlight.qml +++ b/SensorDemo/assets/flashlight.qml @@ -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 diff --git a/SensorDemo/assets/main.qml b/SensorDemo/assets/main.qml index b9747d25..fff0508a 100644 --- a/SensorDemo/assets/main.qml +++ b/SensorDemo/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import QtMobility.sensors 1.2 TabbedPane { diff --git a/SensorDemo/assets/metalfinder.qml b/SensorDemo/assets/metalfinder.qml index 0c24dbc3..3f3dc4fc 100644 --- a/SensorDemo/assets/metalfinder.qml +++ b/SensorDemo/assets/metalfinder.qml @@ -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 diff --git a/SensorDemo/assets/motionalarm.qml b/SensorDemo/assets/motionalarm.qml index d5172db5..21ac31fd 100644 --- a/SensorDemo/assets/motionalarm.qml +++ b/SensorDemo/assets/motionalarm.qml @@ -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 diff --git a/SensorDemo/assets/rotation3D.qml b/SensorDemo/assets/rotation3D.qml index d68d72e1..34ed26a5 100644 --- a/SensorDemo/assets/rotation3D.qml +++ b/SensorDemo/assets/rotation3D.qml @@ -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 diff --git a/SensorDemo/src/Flashlight.cpp b/SensorDemo/src/Flashlight.cpp index 18bc5529..5c546012 100644 --- a/SensorDemo/src/Flashlight.cpp +++ b/SensorDemo/src/Flashlight.cpp @@ -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. diff --git a/SensorDemo/src/main.cpp b/SensorDemo/src/main.cpp index ada05b82..c543660d 100644 --- a/SensorDemo/src/main.cpp +++ b/SensorDemo/src/main.cpp @@ -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. diff --git a/accelgame/assets/Maze.qml b/accelgame/assets/Maze.qml index 9f1cfee2..a9fe4548 100644 --- a/accelgame/assets/Maze.qml +++ b/accelgame/assets/Maze.qml @@ -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 diff --git a/accelgame/assets/main.qml b/accelgame/assets/main.qml index 2270a2cf..9029262b 100644 --- a/accelgame/assets/main.qml +++ b/accelgame/assets/main.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { onCreationCompleted: { diff --git a/accelgame/src/accelerationsensor.cpp b/accelgame/src/accelerationsensor.cpp index ab5acda8..4c140921 100644 --- a/accelgame/src/accelerationsensor.cpp +++ b/accelgame/src/accelerationsensor.cpp @@ -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. diff --git a/accelgame/src/board.cpp b/accelgame/src/board.cpp index 49523672..19b25c9a 100644 --- a/accelgame/src/board.cpp +++ b/accelgame/src/board.cpp @@ -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. diff --git a/accelgame/src/gamecontroller.cpp b/accelgame/src/gamecontroller.cpp index 833a4392..7c7e2118 100644 --- a/accelgame/src/gamecontroller.cpp +++ b/accelgame/src/gamecontroller.cpp @@ -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. diff --git a/accelgame/src/main.cpp b/accelgame/src/main.cpp index 5bb4b5eb..3e309d92 100644 --- a/accelgame/src/main.cpp +++ b/accelgame/src/main.cpp @@ -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. diff --git a/accelgame/src/player.cpp b/accelgame/src/player.cpp index 5b3c50d5..70733abd 100644 --- a/accelgame/src/player.cpp +++ b/accelgame/src/player.cpp @@ -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. diff --git a/accounts/assets/720x720/BackgroundImage.qml b/accounts/assets/720x720/BackgroundImage.qml index 785bbbc2..f10ae8e9 100644 --- a/accounts/assets/720x720/BackgroundImage.qml +++ b/accounts/assets/720x720/BackgroundImage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ImageView { imageSource: "asset:///images/background.amd" diff --git a/accounts/assets/AccountEditor.qml b/accounts/assets/AccountEditor.qml index e8d62507..50747900 100644 --- a/accounts/assets/AccountEditor.qml +++ b/accounts/assets/AccountEditor.qml @@ -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 { diff --git a/accounts/assets/AccountViewer.qml b/accounts/assets/AccountViewer.qml index 00310a25..d97eadf9 100644 --- a/accounts/assets/AccountViewer.qml +++ b/accounts/assets/AccountViewer.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { id: root diff --git a/accounts/assets/BackgroundImage.qml b/accounts/assets/BackgroundImage.qml index f75c2293..45b3acbf 100644 --- a/accounts/assets/BackgroundImage.qml +++ b/accounts/assets/BackgroundImage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ImageView { imageSource: "asset:///images/background.png" diff --git a/accounts/assets/EditorField.qml b/accounts/assets/EditorField.qml index 5e3dc98d..0c2fa763 100644 --- a/accounts/assets/EditorField.qml +++ b/accounts/assets/EditorField.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { diff --git a/accounts/assets/ViewerField.qml b/accounts/assets/ViewerField.qml index 98ba510a..d6421ef1 100644 --- a/accounts/assets/ViewerField.qml +++ b/accounts/assets/ViewerField.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title: titleField.text diff --git a/accounts/assets/main.qml b/accounts/assets/main.qml index 87e648d2..9628207f 100644 --- a/accounts/assets/main.qml +++ b/accounts/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/accounts/src/AccountEditor.cpp b/accounts/src/AccountEditor.cpp index 1ff1c4e9..2f07d748 100644 --- a/accounts/src/AccountEditor.cpp +++ b/accounts/src/AccountEditor.cpp @@ -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. diff --git a/accounts/src/AccountViewer.cpp b/accounts/src/AccountViewer.cpp index 1dbc450f..711cef27 100644 --- a/accounts/src/AccountViewer.cpp +++ b/accounts/src/AccountViewer.cpp @@ -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. diff --git a/accounts/src/Accounts.cpp b/accounts/src/Accounts.cpp index df3ca341..ef71b34b 100644 --- a/accounts/src/Accounts.cpp +++ b/accounts/src/Accounts.cpp @@ -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. diff --git a/accounts/src/main.cpp b/accounts/src/main.cpp index 19a6e1cd..92f80824 100644 --- a/accounts/src/main.cpp +++ b/accounts/src/main.cpp @@ -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. diff --git a/addressbook/assets/720x720/AddressbookScrollView.qml b/addressbook/assets/720x720/AddressbookScrollView.qml index 0aebd874..831980cf 100644 --- a/addressbook/assets/720x720/AddressbookScrollView.qml +++ b/addressbook/assets/720x720/AddressbookScrollView.qml @@ -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 diff --git a/addressbook/assets/720x720/BackgroundImage.qml b/addressbook/assets/720x720/BackgroundImage.qml index 785bbbc2..f10ae8e9 100644 --- a/addressbook/assets/720x720/BackgroundImage.qml +++ b/addressbook/assets/720x720/BackgroundImage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ImageView { imageSource: "asset:///images/background.amd" diff --git a/addressbook/assets/AddressbookScrollView.qml b/addressbook/assets/AddressbookScrollView.qml index 8e9e6dd4..0310f52e 100644 --- a/addressbook/assets/AddressbookScrollView.qml +++ b/addressbook/assets/AddressbookScrollView.qml @@ -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 diff --git a/addressbook/assets/BackgroundImage.qml b/addressbook/assets/BackgroundImage.qml index f75c2293..45b3acbf 100644 --- a/addressbook/assets/BackgroundImage.qml +++ b/addressbook/assets/BackgroundImage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ImageView { imageSource: "asset:///images/background.png" diff --git a/addressbook/assets/ContactEditor.qml b/addressbook/assets/ContactEditor.qml index df2bf8b7..d3b1f8cb 100644 --- a/addressbook/assets/ContactEditor.qml +++ b/addressbook/assets/ContactEditor.qml @@ -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 { diff --git a/addressbook/assets/ContactViewer.qml b/addressbook/assets/ContactViewer.qml index 03070cd6..8dde760c 100644 --- a/addressbook/assets/ContactViewer.qml +++ b/addressbook/assets/ContactViewer.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { id: root diff --git a/addressbook/assets/ViewerField.qml b/addressbook/assets/ViewerField.qml index febed076..995e298f 100644 --- a/addressbook/assets/ViewerField.qml +++ b/addressbook/assets/ViewerField.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title: titleField.text diff --git a/addressbook/assets/main.qml b/addressbook/assets/main.qml index 5be31ee8..70d3057d 100644 --- a/addressbook/assets/main.qml +++ b/addressbook/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/addressbook/src/AddressBook.cpp b/addressbook/src/AddressBook.cpp index 626a4e69..f3457d09 100644 --- a/addressbook/src/AddressBook.cpp +++ b/addressbook/src/AddressBook.cpp @@ -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. diff --git a/addressbook/src/ContactEditor.cpp b/addressbook/src/ContactEditor.cpp index afae11d0..7755818b 100644 --- a/addressbook/src/ContactEditor.cpp +++ b/addressbook/src/ContactEditor.cpp @@ -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. diff --git a/addressbook/src/ContactViewer.cpp b/addressbook/src/ContactViewer.cpp index 4c2a804d..66b85641 100644 --- a/addressbook/src/ContactViewer.cpp +++ b/addressbook/src/ContactViewer.cpp @@ -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. diff --git a/addressbook/src/main.cpp b/addressbook/src/main.cpp index a3a919d2..a9e3afeb 100644 --- a/addressbook/src/main.cpp +++ b/addressbook/src/main.cpp @@ -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. diff --git a/bannerads/assets/720x720/BanneradsScrollView.qml b/bannerads/assets/720x720/BanneradsScrollView.qml index edc190fc..3e43042b 100644 --- a/bannerads/assets/720x720/BanneradsScrollView.qml +++ b/bannerads/assets/720x720/BanneradsScrollView.qml @@ -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 diff --git a/bannerads/assets/720x720/WeatherIcon.qml b/bannerads/assets/720x720/WeatherIcon.qml index 28adf5db..03a69273 100644 --- a/bannerads/assets/720x720/WeatherIcon.qml +++ b/bannerads/assets/720x720/WeatherIcon.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ImageView { preferredWidth: 300 diff --git a/bannerads/assets/BanneradsScrollView.qml b/bannerads/assets/BanneradsScrollView.qml index b8d65d54..612fc872 100644 --- a/bannerads/assets/BanneradsScrollView.qml +++ b/bannerads/assets/BanneradsScrollView.qml @@ -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 diff --git a/bannerads/assets/LabeledLabel.qml b/bannerads/assets/LabeledLabel.qml index da7d6015..5a399a7b 100644 --- a/bannerads/assets/LabeledLabel.qml +++ b/bannerads/assets/LabeledLabel.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // this is a custom control allowing for labeled Labels Container { diff --git a/bannerads/assets/Weather.qml b/bannerads/assets/Weather.qml index 9d0fedbd..3381e110 100644 --- a/bannerads/assets/Weather.qml +++ b/bannerads/assets/Weather.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] // This container lays out visual components of a mock weather application diff --git a/bannerads/assets/WeatherIcon.qml b/bannerads/assets/WeatherIcon.qml index c86bd58b..a3670b0b 100644 --- a/bannerads/assets/WeatherIcon.qml +++ b/bannerads/assets/WeatherIcon.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ImageView { } \ No newline at end of file diff --git a/bannerads/assets/main.qml b/bannerads/assets/main.qml index a70a7b27..8ab5230b 100644 --- a/bannerads/assets/main.qml +++ b/bannerads/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.cascades.advertisement 1.0 // TabbedPane laying out the visual components diff --git a/bannerads/src/main.cpp b/bannerads/src/main.cpp index 3bdaf6fc..3daeddc3 100644 --- a/bannerads/src/main.cpp +++ b/bannerads/src/main.cpp @@ -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. diff --git a/barcodereader/assets/main.qml b/barcodereader/assets/main.qml index b7d26906..4ae3c8cc 100644 --- a/barcodereader/assets/main.qml +++ b/barcodereader/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.cascades.multimedia 1.0 import bb.multimedia 1.0 diff --git a/barcodereader/src/main.cpp b/barcodereader/src/main.cpp index 931569f0..1f833e34 100644 --- a/barcodereader/src/main.cpp +++ b/barcodereader/src/main.cpp @@ -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. diff --git a/batterysample/assets/Battery.qml b/batterysample/assets/Battery.qml index df586b45..f9fe8d48 100644 --- a/batterysample/assets/Battery.qml +++ b/batterysample/assets/Battery.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.device 1.0 Container { diff --git a/batterysample/assets/main.qml b/batterysample/assets/main.qml index 7203ae37..ba0857ca 100644 --- a/batterysample/assets/main.qml +++ b/batterysample/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.device 1.0 // Page laying out the visual components diff --git a/batterysample/src/main.cpp b/batterysample/src/main.cpp index ecf87099..0776e9d7 100644 --- a/batterysample/src/main.cpp +++ b/batterysample/src/main.cpp @@ -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. diff --git a/bbmcontacts/assets/720x720/ContactScrollView.qml b/bbmcontacts/assets/720x720/ContactScrollView.qml index 12eab501..b4bbbf13 100644 --- a/bbmcontacts/assets/720x720/ContactScrollView.qml +++ b/bbmcontacts/assets/720x720/ContactScrollView.qml @@ -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 diff --git a/bbmcontacts/assets/ContactItem.qml b/bbmcontacts/assets/ContactItem.qml index 11be2881..ded76da5 100644 --- a/bbmcontacts/assets/ContactItem.qml +++ b/bbmcontacts/assets/ContactItem.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] // Container that represents a Contact in the ListView Container { diff --git a/bbmcontacts/assets/ContactList.qml b/bbmcontacts/assets/ContactList.qml index b7e51536..50469f25 100644 --- a/bbmcontacts/assets/ContactList.qml +++ b/bbmcontacts/assets/ContactList.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // The main page displaying the number of contacts that have // this application installed and a list of the contacts. diff --git a/bbmcontacts/assets/ContactPage.qml b/bbmcontacts/assets/ContactPage.qml index 455e0483..31a718b8 100644 --- a/bbmcontacts/assets/ContactPage.qml +++ b/bbmcontacts/assets/ContactPage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import com.example.contact 1.0 // Page for displaying Contact details diff --git a/bbmcontacts/assets/ContactScrollView.qml b/bbmcontacts/assets/ContactScrollView.qml index dc8ff767..e62b72de 100644 --- a/bbmcontacts/assets/ContactScrollView.qml +++ b/bbmcontacts/assets/ContactScrollView.qml @@ -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 diff --git a/bbmcontacts/assets/Field.qml b/bbmcontacts/assets/Field.qml index e4cf1035..98fbf09b 100644 --- a/bbmcontacts/assets/Field.qml +++ b/bbmcontacts/assets/Field.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // Custom component mimicking a labeled field Container { diff --git a/bbmcontacts/assets/Registration.qml b/bbmcontacts/assets/Registration.qml index bb3a1488..7f6c412d 100644 --- a/bbmcontacts/assets/Registration.qml +++ b/bbmcontacts/assets/Registration.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // Page dealing with bbm registration NavigationPane { diff --git a/bbmcontacts/src/Contact.cpp b/bbmcontacts/src/Contact.cpp index 50b1c16a..3e23a283 100644 --- a/bbmcontacts/src/Contact.cpp +++ b/bbmcontacts/src/Contact.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/bbmcontacts/src/ContactsDisplay.cpp b/bbmcontacts/src/ContactsDisplay.cpp index 99bd0678..a3d1075f 100644 --- a/bbmcontacts/src/ContactsDisplay.cpp +++ b/bbmcontacts/src/ContactsDisplay.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/bbmcontacts/src/RegistrationHandler.cpp b/bbmcontacts/src/RegistrationHandler.cpp index b060c6c4..46bf62df 100644 --- a/bbmcontacts/src/RegistrationHandler.cpp +++ b/bbmcontacts/src/RegistrationHandler.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/bbmcontacts/src/main.cpp b/bbmcontacts/src/main.cpp index 5ac301ed..fabf4b4a 100644 --- a/bbmcontacts/src/main.cpp +++ b/bbmcontacts/src/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/bbminvitetodownload/assets/invite.qml b/bbminvitetodownload/assets/invite.qml index c9ad3bc8..91c3f70c 100644 --- a/bbminvitetodownload/assets/invite.qml +++ b/bbminvitetodownload/assets/invite.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/bbminvitetodownload/assets/registration.qml b/bbminvitetodownload/assets/registration.qml index 80b62fb6..1897b5cc 100644 --- a/bbminvitetodownload/assets/registration.qml +++ b/bbminvitetodownload/assets/registration.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/bbminvitetodownload/src/InviteToDownload.cpp b/bbminvitetodownload/src/InviteToDownload.cpp index a0f9cccf..4e54dad3 100644 --- a/bbminvitetodownload/src/InviteToDownload.cpp +++ b/bbminvitetodownload/src/InviteToDownload.cpp @@ -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. diff --git a/bbminvitetodownload/src/RegistrationHandler.cpp b/bbminvitetodownload/src/RegistrationHandler.cpp index e8407a0c..f00ad5e4 100644 --- a/bbminvitetodownload/src/RegistrationHandler.cpp +++ b/bbminvitetodownload/src/RegistrationHandler.cpp @@ -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. diff --git a/bbminvitetodownload/src/main.cpp b/bbminvitetodownload/src/main.cpp index e74c1deb..93d122c8 100644 --- a/bbminvitetodownload/src/main.cpp +++ b/bbminvitetodownload/src/main.cpp @@ -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. diff --git a/bbmprofile/assets/720x720/BbmProfileScrollView.qml b/bbmprofile/assets/720x720/BbmProfileScrollView.qml index a297a7fc..e54d3c4d 100644 --- a/bbmprofile/assets/720x720/BbmProfileScrollView.qml +++ b/bbmprofile/assets/720x720/BbmProfileScrollView.qml @@ -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 diff --git a/bbmprofile/assets/BbmProfileScrollView.qml b/bbmprofile/assets/BbmProfileScrollView.qml index 15bda9ab..5d4c3451 100644 --- a/bbmprofile/assets/BbmProfileScrollView.qml +++ b/bbmprofile/assets/BbmProfileScrollView.qml @@ -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 diff --git a/bbmprofile/assets/Field.qml b/bbmprofile/assets/Field.qml index 26ea107a..6ce8ffa8 100644 --- a/bbmprofile/assets/Field.qml +++ b/bbmprofile/assets/Field.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title: titleField.text diff --git a/bbmprofile/assets/UpdateProfile.qml b/bbmprofile/assets/UpdateProfile.qml index 20f5a175..6f451587 100644 --- a/bbmprofile/assets/UpdateProfile.qml +++ b/bbmprofile/assets/UpdateProfile.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.cascades.pickers 1.0 Page { diff --git a/bbmprofile/assets/profile.qml b/bbmprofile/assets/profile.qml index 34da5d35..2d3c7c1a 100644 --- a/bbmprofile/assets/profile.qml +++ b/bbmprofile/assets/profile.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/bbmprofile/assets/registration.qml b/bbmprofile/assets/registration.qml index 80b62fb6..1897b5cc 100644 --- a/bbmprofile/assets/registration.qml +++ b/bbmprofile/assets/registration.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/bbmprofile/src/Profile.cpp b/bbmprofile/src/Profile.cpp index 64a5d502..ce928165 100644 --- a/bbmprofile/src/Profile.cpp +++ b/bbmprofile/src/Profile.cpp @@ -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. diff --git a/bbmprofile/src/ProfileEditor.cpp b/bbmprofile/src/ProfileEditor.cpp index 4f4a0a8c..31a986dd 100644 --- a/bbmprofile/src/ProfileEditor.cpp +++ b/bbmprofile/src/ProfileEditor.cpp @@ -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. diff --git a/bbmprofile/src/RegistrationHandler.cpp b/bbmprofile/src/RegistrationHandler.cpp index d9591379..77ac8bde 100644 --- a/bbmprofile/src/RegistrationHandler.cpp +++ b/bbmprofile/src/RegistrationHandler.cpp @@ -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. diff --git a/bbmprofile/src/main.cpp b/bbmprofile/src/main.cpp index 794d4469..f5481e00 100644 --- a/bbmprofile/src/main.cpp +++ b/bbmprofile/src/main.cpp @@ -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. diff --git a/bbmprofilebox/assets/720x720/BbmProfileBoxScrollView.qml b/bbmprofilebox/assets/720x720/BbmProfileBoxScrollView.qml index 733e2a5a..abd88bda 100644 --- a/bbmprofilebox/assets/720x720/BbmProfileBoxScrollView.qml +++ b/bbmprofilebox/assets/720x720/BbmProfileBoxScrollView.qml @@ -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 diff --git a/bbmprofilebox/assets/BbmProfileBoxScrollView.qml b/bbmprofilebox/assets/BbmProfileBoxScrollView.qml index c6c29b0f..d8912f87 100644 --- a/bbmprofilebox/assets/BbmProfileBoxScrollView.qml +++ b/bbmprofilebox/assets/BbmProfileBoxScrollView.qml @@ -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 diff --git a/bbmprofilebox/assets/NewProfileBoxPage.qml b/bbmprofilebox/assets/NewProfileBoxPage.qml index 49018cd6..4c1f3c54 100644 --- a/bbmprofilebox/assets/NewProfileBoxPage.qml +++ b/bbmprofilebox/assets/NewProfileBoxPage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/bbmprofilebox/assets/ProfileBoxItem.qml b/bbmprofilebox/assets/ProfileBoxItem.qml index f2d83838..3a42c52f 100644 --- a/bbmprofilebox/assets/ProfileBoxItem.qml +++ b/bbmprofilebox/assets/ProfileBoxItem.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { minHeight: 150 diff --git a/bbmprofilebox/assets/main.qml b/bbmprofilebox/assets/main.qml index 1a24f879..70c307ca 100644 --- a/bbmprofilebox/assets/main.qml +++ b/bbmprofilebox/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/bbmprofilebox/assets/registration.qml b/bbmprofilebox/assets/registration.qml index 80b62fb6..1897b5cc 100644 --- a/bbmprofilebox/assets/registration.qml +++ b/bbmprofilebox/assets/registration.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/bbmprofilebox/src/ProfileBoxManager.cpp b/bbmprofilebox/src/ProfileBoxManager.cpp index bc23e5f2..616d5285 100644 --- a/bbmprofilebox/src/ProfileBoxManager.cpp +++ b/bbmprofilebox/src/ProfileBoxManager.cpp @@ -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. diff --git a/bbmprofilebox/src/RegistrationHandler.cpp b/bbmprofilebox/src/RegistrationHandler.cpp index d9591379..77ac8bde 100644 --- a/bbmprofilebox/src/RegistrationHandler.cpp +++ b/bbmprofilebox/src/RegistrationHandler.cpp @@ -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. diff --git a/bbmprofilebox/src/main.cpp b/bbmprofilebox/src/main.cpp index 2fd32781..79b9a337 100644 --- a/bbmprofilebox/src/main.cpp +++ b/bbmprofilebox/src/main.cpp @@ -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. diff --git a/bbmregistration/assets/main.qml b/bbmregistration/assets/main.qml index 81fa7671..c9b53c61 100644 --- a/bbmregistration/assets/main.qml +++ b/bbmregistration/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/bbmregistration/assets/registration.qml b/bbmregistration/assets/registration.qml index ef73a750..a90ef332 100644 --- a/bbmregistration/assets/registration.qml +++ b/bbmregistration/assets/registration.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/bbmregistration/src/App.cpp b/bbmregistration/src/App.cpp index 4f4f7e93..06652052 100644 --- a/bbmregistration/src/App.cpp +++ b/bbmregistration/src/App.cpp @@ -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. diff --git a/bbmregistration/src/RegistrationHandler.cpp b/bbmregistration/src/RegistrationHandler.cpp index b69b585f..719dc182 100644 --- a/bbmregistration/src/RegistrationHandler.cpp +++ b/bbmregistration/src/RegistrationHandler.cpp @@ -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. diff --git a/bbmregistration/src/main.cpp b/bbmregistration/src/main.cpp index f5c9462f..80c85dc4 100644 --- a/bbmregistration/src/main.cpp +++ b/bbmregistration/src/main.cpp @@ -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. diff --git a/bluetoothgatt/assets/720x720/ScrollArea.qml b/bluetoothgatt/assets/720x720/ScrollArea.qml index 6dc9bd26..dcabaa2c 100644 --- a/bluetoothgatt/assets/720x720/ScrollArea.qml +++ b/bluetoothgatt/assets/720x720/ScrollArea.qml @@ -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 diff --git a/bluetoothgatt/assets/Characteristics.qml b/bluetoothgatt/assets/Characteristics.qml index e09849a8..104707c0 100644 --- a/bluetoothgatt/assets/Characteristics.qml +++ b/bluetoothgatt/assets/Characteristics.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { objectName: "CharacteristicsPage" diff --git a/bluetoothgatt/assets/CharacteristicsEditor.qml b/bluetoothgatt/assets/CharacteristicsEditor.qml index c90d2ffb..a8481073 100644 --- a/bluetoothgatt/assets/CharacteristicsEditor.qml +++ b/bluetoothgatt/assets/CharacteristicsEditor.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { objectName: "CharacteristicsEditorPage" diff --git a/bluetoothgatt/assets/LabelLabel.qml b/bluetoothgatt/assets/LabelLabel.qml index 574a7f8e..cc3260fb 100644 --- a/bluetoothgatt/assets/LabelLabel.qml +++ b/bluetoothgatt/assets/LabelLabel.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title: titleLabel.text diff --git a/bluetoothgatt/assets/ScrollArea.qml b/bluetoothgatt/assets/ScrollArea.qml index 02479591..2f2fcf1b 100644 --- a/bluetoothgatt/assets/ScrollArea.qml +++ b/bluetoothgatt/assets/ScrollArea.qml @@ -13,7 +13,7 @@ * 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 diff --git a/bluetoothgatt/assets/Services.qml b/bluetoothgatt/assets/Services.qml index c3778ab6..075cbed7 100644 --- a/bluetoothgatt/assets/Services.qml +++ b/bluetoothgatt/assets/Services.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { objectName: "ServicePage" diff --git a/bluetoothgatt/assets/main.qml b/bluetoothgatt/assets/main.qml index c73c9d7e..4bd129e7 100644 --- a/bluetoothgatt/assets/main.qml +++ b/bluetoothgatt/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.system 1.0 NavigationPane { diff --git a/bluetoothgatt/src/BluetoothGatt.cpp b/bluetoothgatt/src/BluetoothGatt.cpp index 7acfb674..ced8facc 100755 --- a/bluetoothgatt/src/BluetoothGatt.cpp +++ b/bluetoothgatt/src/BluetoothGatt.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/bluetoothgatt/src/CharacteristicsEditor.cpp b/bluetoothgatt/src/CharacteristicsEditor.cpp index 113060d2..a98a7a8d 100644 --- a/bluetoothgatt/src/CharacteristicsEditor.cpp +++ b/bluetoothgatt/src/CharacteristicsEditor.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/bluetoothgatt/src/main.cpp b/bluetoothgatt/src/main.cpp index 9b0570dd..3ba73e27 100644 --- a/bluetoothgatt/src/main.cpp +++ b/bluetoothgatt/src/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/bluetoothsppchat/assets/LabelLabel.qml b/bluetoothsppchat/assets/LabelLabel.qml index 852c2123..8b7bf01a 100644 --- a/bluetoothsppchat/assets/LabelLabel.qml +++ b/bluetoothsppchat/assets/LabelLabel.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { id: container diff --git a/bluetoothsppchat/assets/LocalDeviceInfoSheet.qml b/bluetoothsppchat/assets/LocalDeviceInfoSheet.qml index fb535de1..9cd45d31 100644 --- a/bluetoothsppchat/assets/LocalDeviceInfoSheet.qml +++ b/bluetoothsppchat/assets/LocalDeviceInfoSheet.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // A sheet that shows the information about the local bluetooth device Sheet { diff --git a/bluetoothsppchat/assets/RemoteDevice.qml b/bluetoothsppchat/assets/RemoteDevice.qml index 4eed3d92..60394f10 100644 --- a/bluetoothsppchat/assets/RemoteDevice.qml +++ b/bluetoothsppchat/assets/RemoteDevice.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // A page that lists all services of a remote bluetooth device Page { diff --git a/bluetoothsppchat/assets/RemoteDeviceInfoSheet.qml b/bluetoothsppchat/assets/RemoteDeviceInfoSheet.qml index 6af25e9c..e45cb152 100644 --- a/bluetoothsppchat/assets/RemoteDeviceInfoSheet.qml +++ b/bluetoothsppchat/assets/RemoteDeviceInfoSheet.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // A sheet that shows the information about a remote bluetooth device Sheet { diff --git a/bluetoothsppchat/assets/SPPChat.qml b/bluetoothsppchat/assets/SPPChat.qml index 3c5efe9f..e2b575fc 100644 --- a/bluetoothsppchat/assets/SPPChat.qml +++ b/bluetoothsppchat/assets/SPPChat.qml @@ -68,7 +68,7 @@ Page { hintText: qsTr("Type a message to send") - inputMode: TextAreaInputMode.Chat + inputMode: TextFieldInputMode.Chat input { submitKey: SubmitKey.Send @@ -78,6 +78,7 @@ Page { textInput.text = "" } + } } onTextChanged: { diff --git a/bluetoothsppchat/assets/main.qml b/bluetoothsppchat/assets/main.qml index b8798a19..ec9c08a9 100644 --- a/bluetoothsppchat/assets/main.qml +++ b/bluetoothsppchat/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/bluetoothsppchat/src/BTController.cpp b/bluetoothsppchat/src/BTController.cpp index 9010a933..e8914754 100644 --- a/bluetoothsppchat/src/BTController.cpp +++ b/bluetoothsppchat/src/BTController.cpp @@ -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. diff --git a/bluetoothsppchat/src/ChatManager.cpp b/bluetoothsppchat/src/ChatManager.cpp index 6fddd272..d31cd531 100644 --- a/bluetoothsppchat/src/ChatManager.cpp +++ b/bluetoothsppchat/src/ChatManager.cpp @@ -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. diff --git a/bluetoothsppchat/src/DeviceListing.cpp b/bluetoothsppchat/src/DeviceListing.cpp index 226b5fff..56973291 100644 --- a/bluetoothsppchat/src/DeviceListing.cpp +++ b/bluetoothsppchat/src/DeviceListing.cpp @@ -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. diff --git a/bluetoothsppchat/src/LocalDeviceInfo.cpp b/bluetoothsppchat/src/LocalDeviceInfo.cpp index 11e70bc1..1d29bf76 100644 --- a/bluetoothsppchat/src/LocalDeviceInfo.cpp +++ b/bluetoothsppchat/src/LocalDeviceInfo.cpp @@ -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. diff --git a/bluetoothsppchat/src/RemoteDeviceInfo.cpp b/bluetoothsppchat/src/RemoteDeviceInfo.cpp index d3e1b132..74c2f0f4 100644 --- a/bluetoothsppchat/src/RemoteDeviceInfo.cpp +++ b/bluetoothsppchat/src/RemoteDeviceInfo.cpp @@ -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. diff --git a/bluetoothsppchat/src/main.cpp b/bluetoothsppchat/src/main.cpp index a0f12747..a4115a69 100644 --- a/bluetoothsppchat/src/main.cpp +++ b/bluetoothsppchat/src/main.cpp @@ -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. diff --git a/bpstoqml/assets/AlertSign.qml b/bpstoqml/assets/AlertSign.qml index a4e34223..ec9999b6 100644 --- a/bpstoqml/assets/AlertSign.qml +++ b/bpstoqml/assets/AlertSign.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ImageView { id: sign diff --git a/bpstoqml/assets/CloudButton.qml b/bpstoqml/assets/CloudButton.qml index f247c4fd..3a520367 100644 --- a/bpstoqml/assets/CloudButton.qml +++ b/bpstoqml/assets/CloudButton.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 /** * This class creates a custom Button rather than rely on the Button class. This is diff --git a/bpstoqml/assets/StatusBar.qml b/bpstoqml/assets/StatusBar.qml index a438d336..1d468cdd 100644 --- a/bpstoqml/assets/StatusBar.qml +++ b/bpstoqml/assets/StatusBar.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { layout: DockLayout {} diff --git a/bpstoqml/assets/StatusBarLabel.qml b/bpstoqml/assets/StatusBarLabel.qml index 8da4c105..21ca0b22 100644 --- a/bpstoqml/assets/StatusBarLabel.qml +++ b/bpstoqml/assets/StatusBarLabel.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //This class is a label which is used to display status updates //from interaction with the application or sensors diff --git a/bpstoqml/assets/main.qml b/bpstoqml/assets/main.qml index 6ce2724f..fa79c1d6 100644 --- a/bpstoqml/assets/main.qml +++ b/bpstoqml/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.cascades.bps 1.0 /** diff --git a/bpstoqml/src/AbstractSensorService.cpp b/bpstoqml/src/AbstractSensorService.cpp index 82a24d87..0e759e02 100644 --- a/bpstoqml/src/AbstractSensorService.cpp +++ b/bpstoqml/src/AbstractSensorService.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/AccelerometerService.cpp b/bpstoqml/src/AccelerometerService.cpp index e3306565..ad827d9c 100644 --- a/bpstoqml/src/AccelerometerService.cpp +++ b/bpstoqml/src/AccelerometerService.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/AzimuthPitchRollService.cpp b/bpstoqml/src/AzimuthPitchRollService.cpp index 0acbca94..ef9c87f6 100644 --- a/bpstoqml/src/AzimuthPitchRollService.cpp +++ b/bpstoqml/src/AzimuthPitchRollService.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/BPSEventHandler.cpp b/bpstoqml/src/BPSEventHandler.cpp index 7d1847dd..02ed5173 100644 --- a/bpstoqml/src/BPSEventHandler.cpp +++ b/bpstoqml/src/BPSEventHandler.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/BPSMonitor.cpp b/bpstoqml/src/BPSMonitor.cpp index 1bd1a5ad..49d7a28e 100644 --- a/bpstoqml/src/BPSMonitor.cpp +++ b/bpstoqml/src/BPSMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/GeolocationService.cpp b/bpstoqml/src/GeolocationService.cpp index f431295a..7679ff50 100644 --- a/bpstoqml/src/GeolocationService.cpp +++ b/bpstoqml/src/GeolocationService.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/LightService.cpp b/bpstoqml/src/LightService.cpp index ad2edf2e..bc91f26a 100644 --- a/bpstoqml/src/LightService.cpp +++ b/bpstoqml/src/LightService.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/MagnetometerService.cpp b/bpstoqml/src/MagnetometerService.cpp index 18fb6b36..de90f89e 100644 --- a/bpstoqml/src/MagnetometerService.cpp +++ b/bpstoqml/src/MagnetometerService.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/ProximityService.cpp b/bpstoqml/src/ProximityService.cpp index a20f0935..a90aedd2 100644 --- a/bpstoqml/src/ProximityService.cpp +++ b/bpstoqml/src/ProximityService.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/SmartSignalsApp.cpp b/bpstoqml/src/SmartSignalsApp.cpp index d476a0a9..d8782ddd 100644 --- a/bpstoqml/src/SmartSignalsApp.cpp +++ b/bpstoqml/src/SmartSignalsApp.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/VirtualKeyboardService.cpp b/bpstoqml/src/VirtualKeyboardService.cpp index ee6d10d4..871afb3b 100644 --- a/bpstoqml/src/VirtualKeyboardService.cpp +++ b/bpstoqml/src/VirtualKeyboardService.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/bpstoqml/src/smartsignals.cpp b/bpstoqml/src/smartsignals.cpp index 928b52ea..753c0202 100644 --- a/bpstoqml/src/smartsignals.cpp +++ b/bpstoqml/src/smartsignals.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2013 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. diff --git a/calendar/assets/EventEditor.qml b/calendar/assets/EventEditor.qml index bc478088..8550f867 100644 --- a/calendar/assets/EventEditor.qml +++ b/calendar/assets/EventEditor.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import com.example.bb10samples.pim.calendar 1.0 Page { diff --git a/calendar/assets/EventViewer.qml b/calendar/assets/EventViewer.qml index 34d9849f..6126dd8e 100644 --- a/calendar/assets/EventViewer.qml +++ b/calendar/assets/EventViewer.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { id: root diff --git a/calendar/assets/ViewerField.qml b/calendar/assets/ViewerField.qml index febed076..995e298f 100644 --- a/calendar/assets/ViewerField.qml +++ b/calendar/assets/ViewerField.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title: titleField.text diff --git a/calendar/assets/main.qml b/calendar/assets/main.qml index 3d710c4b..b27f94e1 100644 --- a/calendar/assets/main.qml +++ b/calendar/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/calendar/src/Calendar.cpp b/calendar/src/Calendar.cpp index 0f781410..d5877453 100644 --- a/calendar/src/Calendar.cpp +++ b/calendar/src/Calendar.cpp @@ -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. diff --git a/calendar/src/EventEditor.cpp b/calendar/src/EventEditor.cpp index b9b77698..948da146 100644 --- a/calendar/src/EventEditor.cpp +++ b/calendar/src/EventEditor.cpp @@ -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. diff --git a/calendar/src/EventViewer.cpp b/calendar/src/EventViewer.cpp index 1eb6f24f..ab4e7722 100644 --- a/calendar/src/EventViewer.cpp +++ b/calendar/src/EventViewer.cpp @@ -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. diff --git a/calendar/src/main.cpp b/calendar/src/main.cpp index ab3591da..cd34baa2 100644 --- a/calendar/src/main.cpp +++ b/calendar/src/main.cpp @@ -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. diff --git a/callapizza/assets/720x720/AnimationContainer.qml b/callapizza/assets/720x720/AnimationContainer.qml index 178e099b..dadb6bc9 100644 --- a/callapizza/assets/720x720/AnimationContainer.qml +++ b/callapizza/assets/720x720/AnimationContainer.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property variant target1 diff --git a/callapizza/assets/720x720/ResultListView.qml b/callapizza/assets/720x720/ResultListView.qml index 196651dc..d9ebea80 100644 --- a/callapizza/assets/720x720/ResultListView.qml +++ b/callapizza/assets/720x720/ResultListView.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ListView { preferredHeight: 585 diff --git a/callapizza/assets/AnimationContainer.qml b/callapizza/assets/AnimationContainer.qml index 0c26612b..cc00371a 100644 --- a/callapizza/assets/AnimationContainer.qml +++ b/callapizza/assets/AnimationContainer.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property variant target1 diff --git a/callapizza/assets/PizzeriaItem.qml b/callapizza/assets/PizzeriaItem.qml index b0af3376..19c511d2 100644 --- a/callapizza/assets/PizzeriaItem.qml +++ b/callapizza/assets/PizzeriaItem.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title: titleLabel.text diff --git a/callapizza/assets/ResultListView.qml b/callapizza/assets/ResultListView.qml index 4473d250..6453ece5 100644 --- a/callapizza/assets/ResultListView.qml +++ b/callapizza/assets/ResultListView.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ListView { preferredHeight: 1030 diff --git a/callapizza/assets/main.qml b/callapizza/assets/main.qml index a904e0a8..46eaa402 100644 --- a/callapizza/assets/main.qml +++ b/callapizza/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.system.phone 1.0 import bb.data 1.0 diff --git a/callapizza/src/PizzeriaSearcher.cpp b/callapizza/src/PizzeriaSearcher.cpp index 8ebbb4a0..21287383 100644 --- a/callapizza/src/PizzeriaSearcher.cpp +++ b/callapizza/src/PizzeriaSearcher.cpp @@ -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. diff --git a/callapizza/src/main.cpp b/callapizza/src/main.cpp index 54b850a7..35fc0e37 100644 --- a/callapizza/src/main.cpp +++ b/callapizza/src/main.cpp @@ -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. diff --git a/circularslider/assets/main.qml b/circularslider/assets/main.qml index 06646853..745ef62a 100644 --- a/circularslider/assets/main.qml +++ b/circularslider/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import custom.lib 1.0 Page { diff --git a/circularslider/src/CircularSlider.cpp b/circularslider/src/CircularSlider.cpp index 4c75cce9..7d80caab 100644 --- a/circularslider/src/CircularSlider.cpp +++ b/circularslider/src/CircularSlider.cpp @@ -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. diff --git a/circularslider/src/CircularSliderApp.cpp b/circularslider/src/CircularSliderApp.cpp index cc9115c1..d2dacb67 100644 --- a/circularslider/src/CircularSliderApp.cpp +++ b/circularslider/src/CircularSliderApp.cpp @@ -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. diff --git a/circularslider/src/main.cpp b/circularslider/src/main.cpp index d8a2a425..0d467a12 100644 --- a/circularslider/src/main.cpp +++ b/circularslider/src/main.cpp @@ -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. diff --git a/compass/assets/CompassView.qml b/compass/assets/CompassView.qml index 311ca1a5..d50ba343 100644 --- a/compass/assets/CompassView.qml +++ b/compass/assets/CompassView.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { horizontalAlignment: HorizontalAlignment.Center diff --git a/compass/assets/main.qml b/compass/assets/main.qml index c90b072c..537f748a 100644 --- a/compass/assets/main.qml +++ b/compass/assets/main.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/compass/src/CompassSensor.cpp b/compass/src/CompassSensor.cpp index db05c294..a1c6d29f 100644 --- a/compass/src/CompassSensor.cpp +++ b/compass/src/CompassSensor.cpp @@ -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. diff --git a/compass/src/main.cpp b/compass/src/main.cpp index 9184e93e..3aa6d212 100644 --- a/compass/src/main.cpp +++ b/compass/src/main.cpp @@ -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. diff --git a/custombarcodeinvoker/assets/main.qml b/custombarcodeinvoker/assets/main.qml index 0a759505..860e7f41 100644 --- a/custombarcodeinvoker/assets/main.qml +++ b/custombarcodeinvoker/assets/main.qml @@ -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 // creates one page with a label and button to invoke barcodescanner diff --git a/custombarcodeinvoker/src/BarcodeInvoker.cpp b/custombarcodeinvoker/src/BarcodeInvoker.cpp index 75e2aa13..74ec1b1a 100644 --- a/custombarcodeinvoker/src/BarcodeInvoker.cpp +++ b/custombarcodeinvoker/src/BarcodeInvoker.cpp @@ -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. diff --git a/custombarcodeinvoker/src/main.cpp b/custombarcodeinvoker/src/main.cpp index febf2af8..289e7377 100644 --- a/custombarcodeinvoker/src/main.cpp +++ b/custombarcodeinvoker/src/main.cpp @@ -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. diff --git a/custombarcodescanner/assets/main.qml b/custombarcodescanner/assets/main.qml index 6c4a3e5a..66def90a 100644 --- a/custombarcodescanner/assets/main.qml +++ b/custombarcodescanner/assets/main.qml @@ -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 import bb.community.barcode 1.0 NavigationPane { diff --git a/custombarcodescanner/src/BarcodeDecoder.cpp b/custombarcodescanner/src/BarcodeDecoder.cpp index 7d0a3e2f..526583e4 100644 --- a/custombarcodescanner/src/BarcodeDecoder.cpp +++ b/custombarcodescanner/src/BarcodeDecoder.cpp @@ -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. diff --git a/custombarcodescanner/src/BarcodeScannerApp.cpp b/custombarcodescanner/src/BarcodeScannerApp.cpp index cb897978..83ae65a8 100644 --- a/custombarcodescanner/src/BarcodeScannerApp.cpp +++ b/custombarcodescanner/src/BarcodeScannerApp.cpp @@ -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. diff --git a/custombarcodescanner/src/main.cpp b/custombarcodescanner/src/main.cpp index 58f72bb4..0b3b94dd 100644 --- a/custombarcodescanner/src/main.cpp +++ b/custombarcodescanner/src/main.cpp @@ -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. diff --git a/custommapview/assets/bubble.qml b/custommapview/assets/bubble.qml index 4ecb89a8..f4048824 100644 --- a/custommapview/assets/bubble.qml +++ b/custommapview/assets/bubble.qml @@ -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 Container { // File path of the bubble image diff --git a/custommapview/assets/main.qml b/custommapview/assets/main.qml index 78b840aa..4634cea8 100644 --- a/custommapview/assets/main.qml +++ b/custommapview/assets/main.qml @@ -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 import QtMobility.sensors 1.2 import bb.cascades.maps 1.0 import QtMobilitySubset.location 1.1 diff --git a/custommapview/assets/pin.qml b/custommapview/assets/pin.qml index 5e7437b4..d5adb4ec 100644 --- a/custommapview/assets/pin.qml +++ b/custommapview/assets/pin.qml @@ -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 //! [0] Container { diff --git a/custommapview/src/MapViewDemo.cpp b/custommapview/src/MapViewDemo.cpp index 477f95ef..6969aff8 100644 --- a/custommapview/src/MapViewDemo.cpp +++ b/custommapview/src/MapViewDemo.cpp @@ -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. diff --git a/custommapview/src/main.cpp b/custommapview/src/main.cpp index cec77dc3..7758e353 100644 --- a/custommapview/src/main.cpp +++ b/custommapview/src/main.cpp @@ -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. diff --git a/databasecreation/assets/main.qml b/databasecreation/assets/main.qml index d4a6be1a..1a2712b6 100644 --- a/databasecreation/assets/main.qml +++ b/databasecreation/assets/main.qml @@ -15,7 +15,7 @@ // The first line imports the default Cascades UI library. // This is the minimum you require. -import bb.cascades 1.2 +import bb.cascades 1.0 // The root node has to inherit from AbstractPane -- in this case a Page. // There is always only ONE root not in a QML file and it is typically diff --git a/databasecreation/src/app.cpp b/databasecreation/src/app.cpp index 83242e9c..24353dcf 100644 --- a/databasecreation/src/app.cpp +++ b/databasecreation/src/app.cpp @@ -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. @@ -299,7 +299,7 @@ void App::alert(const QString &message) dialog->setDismissAutomatically(true); // Hides the dialog when a button is pressed. // Setup slot to mark the dialog for deletion in the next event loop after the dialog has been accepted. - bool ok = connect(dialog, SIGNAL(accepted()), dialog, SLOT(deleteLater())); + bool ok = connect(dialog, SIGNAL(finished(bb::system::SystemUiResult::Type)), dialog, SLOT(deleteLater())); Q_ASSERT(ok); Q_UNUSED(ok); dialog->show(); diff --git a/databasecreation/src/main.cpp b/databasecreation/src/main.cpp index 0acb74b7..9b3ba079 100644 --- a/databasecreation/src/main.cpp +++ b/databasecreation/src/main.cpp @@ -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. diff --git a/databasecrud/assets/CreatePage.qml b/databasecrud/assets/CreatePage.qml index 33286cf4..581c371b 100644 --- a/databasecrud/assets/CreatePage.qml +++ b/databasecrud/assets/CreatePage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { layout: DockLayout { diff --git a/databasecrud/assets/DeletePage.qml b/databasecrud/assets/DeletePage.qml index 6e6ba2ed..f6fac519 100644 --- a/databasecrud/assets/DeletePage.qml +++ b/databasecrud/assets/DeletePage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { layout: DockLayout { diff --git a/databasecrud/assets/ErrorPage.qml b/databasecrud/assets/ErrorPage.qml index 9077c92a..b1414089 100644 --- a/databasecrud/assets/ErrorPage.qml +++ b/databasecrud/assets/ErrorPage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { layout: DockLayout { diff --git a/databasecrud/assets/PageBase.qml b/databasecrud/assets/PageBase.qml index 2a3f177f..17953d53 100644 --- a/databasecrud/assets/PageBase.qml +++ b/databasecrud/assets/PageBase.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Page { id: root diff --git a/databasecrud/assets/RetrievePage.qml b/databasecrud/assets/RetrievePage.qml index 59f9380f..a8912f11 100644 --- a/databasecrud/assets/RetrievePage.qml +++ b/databasecrud/assets/RetrievePage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { bottomPadding: 30 diff --git a/databasecrud/assets/UpdatePage.qml b/databasecrud/assets/UpdatePage.qml index 8edf535a..0cb84de0 100644 --- a/databasecrud/assets/UpdatePage.qml +++ b/databasecrud/assets/UpdatePage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { layout: DockLayout { diff --git a/databasecrud/assets/main.qml b/databasecrud/assets/main.qml index 0a751052..92d34586 100644 --- a/databasecrud/assets/main.qml +++ b/databasecrud/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // The root node has to inherit from AbstractPane -- in this case a TabbedPane. // There is always only ONE root not in a QML file and it is typically diff --git a/databasecrud/src/Person.cpp b/databasecrud/src/Person.cpp index f8ff8fd1..9b860976 100644 --- a/databasecrud/src/Person.cpp +++ b/databasecrud/src/Person.cpp @@ -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. diff --git a/databasecrud/src/app.cpp b/databasecrud/src/app.cpp index 2698ae65..f62dd30d 100644 --- a/databasecrud/src/app.cpp +++ b/databasecrud/src/app.cpp @@ -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. diff --git a/databasecrud/src/main.cpp b/databasecrud/src/main.cpp index 4d70c007..e76a63f7 100644 --- a/databasecrud/src/main.cpp +++ b/databasecrud/src/main.cpp @@ -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. diff --git a/dialogs/assets/720x720/DialogsScrollView.qml b/dialogs/assets/720x720/DialogsScrollView.qml index 4fb5f1c3..285363f8 100644 --- a/dialogs/assets/720x720/DialogsScrollView.qml +++ b/dialogs/assets/720x720/DialogsScrollView.qml @@ -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 diff --git a/dialogs/assets/DialogsScrollView.qml b/dialogs/assets/DialogsScrollView.qml index b6259685..675ac67d 100644 --- a/dialogs/assets/DialogsScrollView.qml +++ b/dialogs/assets/DialogsScrollView.qml @@ -13,7 +13,7 @@ * 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 diff --git a/dialogs/assets/main.qml b/dialogs/assets/main.qml index cb28ebb7..b305da57 100644 --- a/dialogs/assets/main.qml +++ b/dialogs/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.system 1.0 Page { diff --git a/dialogs/src/main.cpp b/dialogs/src/main.cpp index f7972cdf..8c0f77f1 100644 --- a/dialogs/src/main.cpp +++ b/dialogs/src/main.cpp @@ -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. diff --git a/dictaphone/assets/720x720/DictaphoneScrollView.qml b/dictaphone/assets/720x720/DictaphoneScrollView.qml index 9aafcacf..0b2c2d38 100644 --- a/dictaphone/assets/720x720/DictaphoneScrollView.qml +++ b/dictaphone/assets/720x720/DictaphoneScrollView.qml @@ -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 diff --git a/dictaphone/assets/DictaphoneScrollView.qml b/dictaphone/assets/DictaphoneScrollView.qml index b78ee8f6..b0189ec7 100644 --- a/dictaphone/assets/DictaphoneScrollView.qml +++ b/dictaphone/assets/DictaphoneScrollView.qml @@ -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 diff --git a/dictaphone/assets/Led.qml b/dictaphone/assets/Led.qml index 52cb36da..44df174d 100644 --- a/dictaphone/assets/Led.qml +++ b/dictaphone/assets/Led.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] ImageView { diff --git a/dictaphone/assets/PlayerPage.qml b/dictaphone/assets/PlayerPage.qml index 6e3aa510..a7bbd5f4 100644 --- a/dictaphone/assets/PlayerPage.qml +++ b/dictaphone/assets/PlayerPage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.multimedia 1.0 //! [0] diff --git a/dictaphone/assets/Tape.qml b/dictaphone/assets/Tape.qml index 5d1e6f7b..5c01f4b7 100644 --- a/dictaphone/assets/Tape.qml +++ b/dictaphone/assets/Tape.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { diff --git a/dictaphone/assets/main.qml b/dictaphone/assets/main.qml index 4e9882e6..dfe4f5aa 100644 --- a/dictaphone/assets/main.qml +++ b/dictaphone/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.multimedia 1.0 /** diff --git a/dictaphone/src/TrackManager.cpp b/dictaphone/src/TrackManager.cpp index efe1dccc..8ce2b2dc 100644 --- a/dictaphone/src/TrackManager.cpp +++ b/dictaphone/src/TrackManager.cpp @@ -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. diff --git a/dictaphone/src/main.cpp b/dictaphone/src/main.cpp index 81feed7c..520c3cab 100644 --- a/dictaphone/src/main.cpp +++ b/dictaphone/src/main.cpp @@ -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. diff --git a/filepicker/assets/720x720/FilepickerScrollView.qml b/filepicker/assets/720x720/FilepickerScrollView.qml index add49334..2ffa9029 100644 --- a/filepicker/assets/720x720/FilepickerScrollView.qml +++ b/filepicker/assets/720x720/FilepickerScrollView.qml @@ -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 diff --git a/filepicker/assets/FilepickerScrollView.qml b/filepicker/assets/FilepickerScrollView.qml index 35065345..5585d06f 100644 --- a/filepicker/assets/FilepickerScrollView.qml +++ b/filepicker/assets/FilepickerScrollView.qml @@ -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 diff --git a/filepicker/assets/main.qml b/filepicker/assets/main.qml index ba344b92..7ef2b506 100644 --- a/filepicker/assets/main.qml +++ b/filepicker/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.cascades.pickers 1.0 Page { diff --git a/filepicker/src/main.cpp b/filepicker/src/main.cpp index ef578dd4..6fb1156f 100644 --- a/filepicker/src/main.cpp +++ b/filepicker/src/main.cpp @@ -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. diff --git a/filtereddatamodel/assets/main.qml b/filtereddatamodel/assets/main.qml index 10d34795..b4aeb6e1 100644 --- a/filtereddatamodel/assets/main.qml +++ b/filtereddatamodel/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/filtereddatamodel/src/app.cpp b/filtereddatamodel/src/app.cpp index cb91ba17..524631ab 100644 --- a/filtereddatamodel/src/app.cpp +++ b/filtereddatamodel/src/app.cpp @@ -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. diff --git a/filtereddatamodel/src/filtereddatamodel.cpp b/filtereddatamodel/src/filtereddatamodel.cpp index 13fcaf0f..78623e71 100644 --- a/filtereddatamodel/src/filtereddatamodel.cpp +++ b/filtereddatamodel/src/filtereddatamodel.cpp @@ -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. diff --git a/filtereddatamodel/src/main.cpp b/filtereddatamodel/src/main.cpp index 50761f50..80428079 100644 --- a/filtereddatamodel/src/main.cpp +++ b/filtereddatamodel/src/main.cpp @@ -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. diff --git a/filtereddatamodel/src/vegetablesdatamodel.cpp b/filtereddatamodel/src/vegetablesdatamodel.cpp index 35f6e4d8..2d3a51f8 100644 --- a/filtereddatamodel/src/vegetablesdatamodel.cpp +++ b/filtereddatamodel/src/vegetablesdatamodel.cpp @@ -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. diff --git a/httptest/assets/controls/NetworkActivity.qml b/httptest/assets/controls/NetworkActivity.qml index 92bd181b..4188110a 100644 --- a/httptest/assets/controls/NetworkActivity.qml +++ b/httptest/assets/controls/NetworkActivity.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 /** * This is a custom control to display network activity * diff --git a/httptest/assets/ipinfo.qml b/httptest/assets/ipinfo.qml index cbf8a868..a97d0154 100644 --- a/httptest/assets/ipinfo.qml +++ b/httptest/assets/ipinfo.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import Network.ExternalIP 1.0 import "controls" import my.library 1.0 diff --git a/httptest/assets/main.qml b/httptest/assets/main.qml index 09a3a195..742a5af5 100644 --- a/httptest/assets/main.qml +++ b/httptest/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 /** * This is a TabbedPane layout that allows you to switch 3 NavigationPanes (GET, POST, Settings) diff --git a/httptest/assets/post.qml b/httptest/assets/post.qml index bbc65b0b..d9c30cb5 100644 --- a/httptest/assets/post.qml +++ b/httptest/assets/post.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import Network.PostHttp 1.0 import "controls" import my.library 1.0 diff --git a/httptest/assets/requestinfo.qml b/httptest/assets/requestinfo.qml index 29d4a12f..f651f9cb 100644 --- a/httptest/assets/requestinfo.qml +++ b/httptest/assets/requestinfo.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import Network.RequestHeaders 1.0 import "controls" import my.library 1.0 diff --git a/httptest/src/AppSettings.cpp b/httptest/src/AppSettings.cpp index 96b90a4e..b41e6e8b 100644 --- a/httptest/src/AppSettings.cpp +++ b/httptest/src/AppSettings.cpp @@ -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. diff --git a/httptest/src/ExternalIP.cpp b/httptest/src/ExternalIP.cpp index e2aed758..b76d0746 100644 --- a/httptest/src/ExternalIP.cpp +++ b/httptest/src/ExternalIP.cpp @@ -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. diff --git a/httptest/src/HttpSampleApp.cpp b/httptest/src/HttpSampleApp.cpp index 50b3d62f..2fd92835 100644 --- a/httptest/src/HttpSampleApp.cpp +++ b/httptest/src/HttpSampleApp.cpp @@ -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. diff --git a/httptest/src/PostHttp.cpp b/httptest/src/PostHttp.cpp index 4f272cca..8f5d32bb 100644 --- a/httptest/src/PostHttp.cpp +++ b/httptest/src/PostHttp.cpp @@ -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. diff --git a/httptest/src/RequestHeaders.cpp b/httptest/src/RequestHeaders.cpp index 888ada66..5b17eef7 100644 --- a/httptest/src/RequestHeaders.cpp +++ b/httptest/src/RequestHeaders.cpp @@ -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. diff --git a/httptest/src/main.cpp b/httptest/src/main.cpp index e654efb3..68e7ce65 100644 --- a/httptest/src/main.cpp +++ b/httptest/src/main.cpp @@ -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. diff --git a/imageloader/assets/main.qml b/imageloader/assets/main.qml index dda61234..da842927 100644 --- a/imageloader/assets/main.qml +++ b/imageloader/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/imageloader/src/app.cpp b/imageloader/src/app.cpp index 1dd39bb5..ab35127f 100644 --- a/imageloader/src/app.cpp +++ b/imageloader/src/app.cpp @@ -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. diff --git a/imageloader/src/imageloader.cpp b/imageloader/src/imageloader.cpp index ab40c7a6..bbbe36aa 100644 --- a/imageloader/src/imageloader.cpp +++ b/imageloader/src/imageloader.cpp @@ -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. diff --git a/imageloader/src/imageprocessor.cpp b/imageloader/src/imageprocessor.cpp index 1ee921d0..0cf79f60 100644 --- a/imageloader/src/imageprocessor.cpp +++ b/imageloader/src/imageprocessor.cpp @@ -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. diff --git a/imageloader/src/main.cpp b/imageloader/src/main.cpp index 2786398a..72388f09 100644 --- a/imageloader/src/main.cpp +++ b/imageloader/src/main.cpp @@ -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. diff --git a/imagerotation/assets/main.qml b/imagerotation/assets/main.qml index 033af38f..25afe07d 100644 --- a/imagerotation/assets/main.qml +++ b/imagerotation/assets/main.qml @@ -13,7 +13,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 Page { Container { diff --git a/imagerotation/src/main.cpp b/imagerotation/src/main.cpp index 18fa2c92..61cc2274 100644 --- a/imagerotation/src/main.cpp +++ b/imagerotation/src/main.cpp @@ -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. diff --git a/imagerotation/src/rotationsensor.cpp b/imagerotation/src/rotationsensor.cpp index 7a8b70f1..5c701971 100644 --- a/imagerotation/src/rotationsensor.cpp +++ b/imagerotation/src/rotationsensor.cpp @@ -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. diff --git a/invokeclient/assets/QueryResultSheet.qml b/invokeclient/assets/QueryResultSheet.qml index 86aeb5e4..6e9f4f9f 100644 --- a/invokeclient/assets/QueryResultSheet.qml +++ b/invokeclient/assets/QueryResultSheet.qml @@ -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 Sheet { id: root diff --git a/invokeclient/assets/main.qml b/invokeclient/assets/main.qml index 02a8b77f..c92679e2 100644 --- a/invokeclient/assets/main.qml +++ b/invokeclient/assets/main.qml @@ -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 import bb.cascades.pickers 1.0 Page { diff --git a/invokeclient/src/app.cpp b/invokeclient/src/app.cpp index 00feecaf..5ebe8326 100644 --- a/invokeclient/src/app.cpp +++ b/invokeclient/src/app.cpp @@ -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. diff --git a/invokeclient/src/main.cpp b/invokeclient/src/main.cpp index 810a5ba9..bb90e9f2 100644 --- a/invokeclient/src/main.cpp +++ b/invokeclient/src/main.cpp @@ -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. diff --git a/invoketarget/assets/Composer.qml b/invoketarget/assets/Composer.qml index 411bce32..9fde28d5 100644 --- a/invoketarget/assets/Composer.qml +++ b/invoketarget/assets/Composer.qml @@ -1,4 +1,4 @@ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] NavigationPane { backButtonsVisible: false diff --git a/invoketarget/assets/LabelLabel.qml b/invoketarget/assets/LabelLabel.qml index d5b748f1..8a3767b9 100644 --- a/invoketarget/assets/LabelLabel.qml +++ b/invoketarget/assets/LabelLabel.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias label: labelPart.text diff --git a/invoketarget/assets/Picker.qml b/invoketarget/assets/Picker.qml index 8806f3ed..482c1c90 100644 --- a/invoketarget/assets/Picker.qml +++ b/invoketarget/assets/Picker.qml @@ -1,4 +1,4 @@ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] NavigationPane { diff --git a/invoketarget/assets/Previewer.qml b/invoketarget/assets/Previewer.qml index 90307ef0..b5e98840 100644 --- a/invoketarget/assets/Previewer.qml +++ b/invoketarget/assets/Previewer.qml @@ -1,4 +1,4 @@ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] NavigationPane { backButtonsVisible: true diff --git a/invoketarget/assets/main.qml b/invoketarget/assets/main.qml index 4a757644..dd7fb64d 100644 --- a/invoketarget/assets/main.qml +++ b/invoketarget/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { titleBar: TitleBar { diff --git a/invoketarget/src/app.cpp b/invoketarget/src/app.cpp index 00f4599c..aaf7978d 100644 --- a/invoketarget/src/app.cpp +++ b/invoketarget/src/app.cpp @@ -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. diff --git a/invoketarget/src/main.cpp b/invoketarget/src/main.cpp index 9c39ff29..b700b5da 100644 --- a/invoketarget/src/main.cpp +++ b/invoketarget/src/main.cpp @@ -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. diff --git a/jsonreadwrite/assets/main.qml b/jsonreadwrite/assets/main.qml index dafa6808..81b4e65d 100644 --- a/jsonreadwrite/assets/main.qml +++ b/jsonreadwrite/assets/main.qml @@ -13,7 +13,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 Page { // topmost container for entire page diff --git a/jsonreadwrite/src/QtObjectFormatter.cpp b/jsonreadwrite/src/QtObjectFormatter.cpp index 37e3e008..d73389d3 100644 --- a/jsonreadwrite/src/QtObjectFormatter.cpp +++ b/jsonreadwrite/src/QtObjectFormatter.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** - ** Portions Copyright (C) 2012 Research In Motion Limited. + ** Portions Copyright (C) 2012, 2013 BlackBerry Limited. ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. - ** Contact: Research In Motion Ltd. (http://www.rim.com/company/contact/) + ** Contact: BlackBerry Ltd. (http://www.blackberry.com/company/contact/) ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the examples of the BB10 Platform and is derived @@ -20,7 +20,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. - ** * Neither the name of Research In Motion, nor the name of Nokia + ** * Neither the name of BlackBerry, nor the name of Nokia ** Corporation and its Subsidiary(-ies), nor the names of its ** contributors may be used to endorse or promote products ** derived from this software without specific prior written diff --git a/jsonreadwrite/src/app.cpp b/jsonreadwrite/src/app.cpp index b65643e3..2691d77e 100644 --- a/jsonreadwrite/src/app.cpp +++ b/jsonreadwrite/src/app.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** - ** Portions Copyright (C) 2012 Research In Motion Limited. + ** Portions Copyright (C) 2012, 2013 BlackBerry Limited. ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. - ** Contact: Research In Motion Ltd. (http://www.rim.com/company/contact/) + ** Contact: BlackBerry Ltd. (http://www.blackberry.com/company/contact/) ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the examples of the BB10 Platform and is derived @@ -20,7 +20,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. - ** * Neither the name of Research In Motion, nor the name of Nokia + ** * Neither the name of BlackBerry, nor the name of Nokia ** Corporation and its Subsidiary(-ies), nor the names of its ** contributors may be used to endorse or promote products ** derived from this software without specific prior written diff --git a/jsonreadwrite/src/main.cpp b/jsonreadwrite/src/main.cpp index fdabd692..32050e63 100644 --- a/jsonreadwrite/src/main.cpp +++ b/jsonreadwrite/src/main.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** - ** Portions Copyright (C) 2012 Research In Motion Limited. + ** Portions Copyright (C) 2012, 2013 BlackBerry Limited. ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. - ** Contact: Research In Motion Ltd. (http://www.rim.com/company/contact/) + ** Contact: BlackBerry Ltd. (http://www.blackberry.com/company/contact/) ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the examples of the BB10 Platform and is derived @@ -20,7 +20,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. - ** * Neither the name of Research In Motion, nor the name of Nokia + ** * Neither the name of BlackBerry, nor the name of Nokia ** Corporation and its Subsidiary(-ies), nor the names of its ** contributors may be used to endorse or promote products ** derived from this software without specific prior written diff --git a/led/assets/main.qml b/led/assets/main.qml index ac2b68a9..5aaecd41 100644 --- a/led/assets/main.qml +++ b/led/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.device 1.0 // Page which organizes the various visual components diff --git a/led/src/main.cpp b/led/src/main.cpp index d1a3595d..46c55e74 100644 --- a/led/src/main.cpp +++ b/led/src/main.cpp @@ -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. diff --git a/loader/assets/ColoredRectangle.qml b/loader/assets/ColoredRectangle.qml index 0510cba3..e6c4bee4 100644 --- a/loader/assets/ColoredRectangle.qml +++ b/loader/assets/ColoredRectangle.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { id: root diff --git a/loader/assets/Page1.qml b/loader/assets/Page1.qml index 90612d3b..7664ddd0 100644 --- a/loader/assets/Page1.qml +++ b/loader/assets/Page1.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ColoredRectangle { title: qsTr ("Page 1") diff --git a/loader/assets/Page2.qml b/loader/assets/Page2.qml index e3405f5f..1cc03cb3 100644 --- a/loader/assets/Page2.qml +++ b/loader/assets/Page2.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ColoredRectangle { title: qsTr ("Page 2") diff --git a/loader/assets/Page3.qml b/loader/assets/Page3.qml index 290d533d..0add3e31 100644 --- a/loader/assets/Page3.qml +++ b/loader/assets/Page3.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ColoredRectangle { title: qsTr ("Page 3") diff --git a/loader/assets/Page4.qml b/loader/assets/Page4.qml index 2b497bac..edafa627 100644 --- a/loader/assets/Page4.qml +++ b/loader/assets/Page4.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ColoredRectangle { title: qsTr ("Page 4") diff --git a/loader/assets/Page5.qml b/loader/assets/Page5.qml index c89aedca..63e5ffc5 100644 --- a/loader/assets/Page5.qml +++ b/loader/assets/Page5.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 ColoredRectangle { title: qsTr ("Page 5") diff --git a/loader/assets/main.qml b/loader/assets/main.qml index c5eb5a76..0041261a 100644 --- a/loader/assets/main.qml +++ b/loader/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import Utils 1.0 /** diff --git a/loader/src/Loader.cpp b/loader/src/Loader.cpp index a35b6a0b..3a46ea3c 100644 --- a/loader/src/Loader.cpp +++ b/loader/src/Loader.cpp @@ -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. diff --git a/loader/src/main.cpp b/loader/src/main.cpp index 2d439d69..ea83488c 100644 --- a/loader/src/main.cpp +++ b/loader/src/main.cpp @@ -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. diff --git a/locationdiagnostics/assets/LabelLabel.qml b/locationdiagnostics/assets/LabelLabel.qml index fd765be9..21c8661a 100644 --- a/locationdiagnostics/assets/LabelLabel.qml +++ b/locationdiagnostics/assets/LabelLabel.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias label: labelPart.text diff --git a/locationdiagnostics/assets/LocationPage.qml b/locationdiagnostics/assets/LocationPage.qml index 4d5e2069..90318080 100644 --- a/locationdiagnostics/assets/LocationPage.qml +++ b/locationdiagnostics/assets/LocationPage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.cascades.maps 1.0 Page { diff --git a/locationdiagnostics/assets/ToggleLabelButton.qml b/locationdiagnostics/assets/ToggleLabelButton.qml index e8524a6e..8352dd10 100644 --- a/locationdiagnostics/assets/ToggleLabelButton.qml +++ b/locationdiagnostics/assets/ToggleLabelButton.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { id: root diff --git a/locationdiagnostics/assets/WarpDrive.qml b/locationdiagnostics/assets/WarpDrive.qml index b68ab7fc..545fe94e 100644 --- a/locationdiagnostics/assets/WarpDrive.qml +++ b/locationdiagnostics/assets/WarpDrive.qml @@ -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 Container { id: root diff --git a/locationdiagnostics/assets/main.qml b/locationdiagnostics/assets/main.qml index c297933d..34004e65 100644 --- a/locationdiagnostics/assets/main.qml +++ b/locationdiagnostics/assets/main.qml @@ -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 NavigationPane { id: navigationPane diff --git a/locationdiagnostics/src/LocationDiagnostics.cpp b/locationdiagnostics/src/LocationDiagnostics.cpp index 07f460ff..72d61035 100644 --- a/locationdiagnostics/src/LocationDiagnostics.cpp +++ b/locationdiagnostics/src/LocationDiagnostics.cpp @@ -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. diff --git a/locationdiagnostics/src/LocationSession.cpp b/locationdiagnostics/src/LocationSession.cpp index 685e7b9c..415ba1ff 100644 --- a/locationdiagnostics/src/LocationSession.cpp +++ b/locationdiagnostics/src/LocationSession.cpp @@ -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. diff --git a/locationdiagnostics/src/RawLocationParser.cpp b/locationdiagnostics/src/RawLocationParser.cpp index f61a3beb..0de354c2 100644 --- a/locationdiagnostics/src/RawLocationParser.cpp +++ b/locationdiagnostics/src/RawLocationParser.cpp @@ -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. diff --git a/locationdiagnostics/src/main.cpp b/locationdiagnostics/src/main.cpp index d641376d..986965e7 100644 --- a/locationdiagnostics/src/main.cpp +++ b/locationdiagnostics/src/main.cpp @@ -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. diff --git a/mapview/assets/main.qml b/mapview/assets/main.qml index 703a8e4b..fe586906 100644 --- a/mapview/assets/main.qml +++ b/mapview/assets/main.qml @@ -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 import QtMobility.sensors 1.2 import bb.cascades.maps 1.0 import QtMobilitySubset.location 1.1 diff --git a/mapview/src/MapViewDemo.cpp b/mapview/src/MapViewDemo.cpp index b419c58a..d2dc50b6 100644 --- a/mapview/src/MapViewDemo.cpp +++ b/mapview/src/MapViewDemo.cpp @@ -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. diff --git a/mapview/src/main.cpp b/mapview/src/main.cpp index 1fbba84c..5f9b7d10 100644 --- a/mapview/src/main.cpp +++ b/mapview/src/main.cpp @@ -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. diff --git a/messages/assets/MessageComposer.qml b/messages/assets/MessageComposer.qml index e1b92447..124bbd86 100644 --- a/messages/assets/MessageComposer.qml +++ b/messages/assets/MessageComposer.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import com.example.bb10samples.pim.messages 1.0 Page { diff --git a/messages/assets/MessageViewer.qml b/messages/assets/MessageViewer.qml index 4cfd30d2..e6c91a27 100644 --- a/messages/assets/MessageViewer.qml +++ b/messages/assets/MessageViewer.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { id: root diff --git a/messages/assets/main.qml b/messages/assets/main.qml index 3ab1ebe5..a0ef6ade 100644 --- a/messages/assets/main.qml +++ b/messages/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/messages/src/MessageComposer.cpp b/messages/src/MessageComposer.cpp index 1507ab09..f8a898c5 100644 --- a/messages/src/MessageComposer.cpp +++ b/messages/src/MessageComposer.cpp @@ -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. diff --git a/messages/src/MessageViewer.cpp b/messages/src/MessageViewer.cpp index 921b1f3f..639f43a1 100644 --- a/messages/src/MessageViewer.cpp +++ b/messages/src/MessageViewer.cpp @@ -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. diff --git a/messages/src/Messages.cpp b/messages/src/Messages.cpp index a2a99299..2db07002 100644 --- a/messages/src/Messages.cpp +++ b/messages/src/Messages.cpp @@ -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. diff --git a/messages/src/main.cpp b/messages/src/main.cpp index 38f6abe1..601431d2 100644 --- a/messages/src/main.cpp +++ b/messages/src/main.cpp @@ -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. diff --git a/nfcmacaddress/assets/main.qml b/nfcmacaddress/assets/main.qml index 255bde7b..2bde1fb0 100644 --- a/nfcmacaddress/assets/main.qml +++ b/nfcmacaddress/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/nfcmacaddress/src/MacAddressHandler.cpp b/nfcmacaddress/src/MacAddressHandler.cpp index f2fa00c5..855a9c06 100644 --- a/nfcmacaddress/src/MacAddressHandler.cpp +++ b/nfcmacaddress/src/MacAddressHandler.cpp @@ -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. diff --git a/nfcmacaddress/src/main.cpp b/nfcmacaddress/src/main.cpp index 973dda45..e2c78502 100644 --- a/nfcmacaddress/src/main.cpp +++ b/nfcmacaddress/src/main.cpp @@ -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. diff --git a/nfcreceiver/assets/Field.qml b/nfcreceiver/assets/Field.qml index 26ea107a..6ce8ffa8 100644 --- a/nfcreceiver/assets/Field.qml +++ b/nfcreceiver/assets/Field.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title: titleField.text diff --git a/nfcreceiver/assets/main.qml b/nfcreceiver/assets/main.qml index 47a0a339..6d36127d 100644 --- a/nfcreceiver/assets/main.qml +++ b/nfcreceiver/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/nfcreceiver/src/NfcReceiver.cpp b/nfcreceiver/src/NfcReceiver.cpp index 373fcc82..9076178f 100644 --- a/nfcreceiver/src/NfcReceiver.cpp +++ b/nfcreceiver/src/NfcReceiver.cpp @@ -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. diff --git a/nfcreceiver/src/main.cpp b/nfcreceiver/src/main.cpp index e6c9a9ea..02d75419 100644 --- a/nfcreceiver/src/main.cpp +++ b/nfcreceiver/src/main.cpp @@ -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. diff --git a/nfcsender/assets/main.qml b/nfcsender/assets/main.qml index f6478df3..9d931232 100644 --- a/nfcsender/assets/main.qml +++ b/nfcsender/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/nfcsender/src/NfcSender.cpp b/nfcsender/src/NfcSender.cpp index 4a64abb1..8d3b3211 100644 --- a/nfcsender/src/NfcSender.cpp +++ b/nfcsender/src/NfcSender.cpp @@ -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. diff --git a/nfcsender/src/main.cpp b/nfcsender/src/main.cpp index 9e0db757..02a2b995 100644 --- a/nfcsender/src/main.cpp +++ b/nfcsender/src/main.cpp @@ -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. diff --git a/nfcshare/assets/main.qml b/nfcshare/assets/main.qml index b1531156..d2b93b35 100644 --- a/nfcshare/assets/main.qml +++ b/nfcshare/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import custom 1.0 Page { diff --git a/nfcshare/src/FileListModel.cpp b/nfcshare/src/FileListModel.cpp index a638ace9..347f4925 100644 --- a/nfcshare/src/FileListModel.cpp +++ b/nfcshare/src/FileListModel.cpp @@ -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. diff --git a/nfcshare/src/NfcShareHandler.cpp b/nfcshare/src/NfcShareHandler.cpp index b51b0fff..e61d5a72 100644 --- a/nfcshare/src/NfcShareHandler.cpp +++ b/nfcshare/src/NfcShareHandler.cpp @@ -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. diff --git a/nfcshare/src/main.cpp b/nfcshare/src/main.cpp index 90119f76..3da2787b 100644 --- a/nfcshare/src/main.cpp +++ b/nfcshare/src/main.cpp @@ -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. diff --git a/notebook/assets/NoteEditor.qml b/notebook/assets/NoteEditor.qml index c36ee1d1..6b9daf77 100644 --- a/notebook/assets/NoteEditor.qml +++ b/notebook/assets/NoteEditor.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import com.example.bb10samples.pim.notebook 1.0 Page { diff --git a/notebook/assets/NoteViewer.qml b/notebook/assets/NoteViewer.qml index 82e5745a..716607e2 100644 --- a/notebook/assets/NoteViewer.qml +++ b/notebook/assets/NoteViewer.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { id: root diff --git a/notebook/assets/ViewerField.qml b/notebook/assets/ViewerField.qml index febed076..995e298f 100644 --- a/notebook/assets/ViewerField.qml +++ b/notebook/assets/ViewerField.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title: titleField.text diff --git a/notebook/assets/main.qml b/notebook/assets/main.qml index 295011ca..2b7ab84f 100644 --- a/notebook/assets/main.qml +++ b/notebook/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/notebook/src/NoteBook.cpp b/notebook/src/NoteBook.cpp index a6248eab..a3a87b56 100644 --- a/notebook/src/NoteBook.cpp +++ b/notebook/src/NoteBook.cpp @@ -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. diff --git a/notebook/src/NoteEditor.cpp b/notebook/src/NoteEditor.cpp index a484a034..8a8057fa 100644 --- a/notebook/src/NoteEditor.cpp +++ b/notebook/src/NoteEditor.cpp @@ -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. diff --git a/notebook/src/NoteViewer.cpp b/notebook/src/NoteViewer.cpp index b7182e16..b66332bf 100644 --- a/notebook/src/NoteViewer.cpp +++ b/notebook/src/NoteViewer.cpp @@ -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. diff --git a/notebook/src/main.cpp b/notebook/src/main.cpp index b7e2110f..dae472cc 100644 --- a/notebook/src/main.cpp +++ b/notebook/src/main.cpp @@ -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. diff --git a/notifications/assets/main.qml b/notifications/assets/main.qml index 7e478730..d22ad549 100644 --- a/notifications/assets/main.qml +++ b/notifications/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.platform 1.0 import bb.system 1.0 diff --git a/notifications/src/main.cpp b/notifications/src/main.cpp index c09c8053..22df5497 100644 --- a/notifications/src/main.cpp +++ b/notifications/src/main.cpp @@ -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. diff --git a/nowplaying/assets/ProgressBar.qml b/nowplaying/assets/ProgressBar.qml index d39bbae2..155bd6b3 100644 --- a/nowplaying/assets/ProgressBar.qml +++ b/nowplaying/assets/ProgressBar.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { diff --git a/nowplaying/assets/main.qml b/nowplaying/assets/main.qml index 0ec502b7..514fe12a 100644 --- a/nowplaying/assets/main.qml +++ b/nowplaying/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.multimedia 1.0 Page { diff --git a/nowplaying/src/main.cpp b/nowplaying/src/main.cpp index cf74d7af..8cf95dd3 100644 --- a/nowplaying/src/main.cpp +++ b/nowplaying/src/main.cpp @@ -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. diff --git a/orientation/assets/main.qml b/orientation/assets/main.qml index 73b0aad3..5513e7fc 100644 --- a/orientation/assets/main.qml +++ b/orientation/assets/main.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import Utils 1.0 Page { diff --git a/orientation/src/OrientationSensor.cpp b/orientation/src/OrientationSensor.cpp index d78398c7..57a35e52 100644 --- a/orientation/src/OrientationSensor.cpp +++ b/orientation/src/OrientationSensor.cpp @@ -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. diff --git a/orientation/src/main.cpp b/orientation/src/main.cpp index 3dfacb90..742004c2 100644 --- a/orientation/src/main.cpp +++ b/orientation/src/main.cpp @@ -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. diff --git a/pageddatamodel/assets/CustomItem.qml b/pageddatamodel/assets/CustomItem.qml index 7c382db4..adaab6ee 100644 --- a/pageddatamodel/assets/CustomItem.qml +++ b/pageddatamodel/assets/CustomItem.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { id: root diff --git a/pageddatamodel/assets/main.qml b/pageddatamodel/assets/main.qml index eb095a64..65def77d 100644 --- a/pageddatamodel/assets/main.qml +++ b/pageddatamodel/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/pageddatamodel/src/main.cpp b/pageddatamodel/src/main.cpp index 85098637..0658ebe8 100644 --- a/pageddatamodel/src/main.cpp +++ b/pageddatamodel/src/main.cpp @@ -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. diff --git a/pageddatamodel/src/pageddatamodel.cpp b/pageddatamodel/src/pageddatamodel.cpp index 1a0675e0..ddc34c87 100644 --- a/pageddatamodel/src/pageddatamodel.cpp +++ b/pageddatamodel/src/pageddatamodel.cpp @@ -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. diff --git a/paymentservice/assets/DigitalGood.qml b/paymentservice/assets/DigitalGood.qml index c31ac722..e4bf58a1 100644 --- a/paymentservice/assets/DigitalGood.qml +++ b/paymentservice/assets/DigitalGood.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // Container for organizing the digital good visula display Container { diff --git a/paymentservice/assets/MessageBox.qml b/paymentservice/assets/MessageBox.qml index e9cfa00a..6f661b27 100644 --- a/paymentservice/assets/MessageBox.qml +++ b/paymentservice/assets/MessageBox.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import com.sample.payment 1.0 // Container creating a message box type of display diff --git a/paymentservice/assets/main.qml b/paymentservice/assets/main.qml index bbe194a8..473af356 100644 --- a/paymentservice/assets/main.qml +++ b/paymentservice/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import com.sample.payment 1.0 // Standard TabbedPane to provide the various payment screens diff --git a/paymentservice/src/PaymentServiceControl.cpp b/paymentservice/src/PaymentServiceControl.cpp index 50a36885..0862b07a 100644 --- a/paymentservice/src/PaymentServiceControl.cpp +++ b/paymentservice/src/PaymentServiceControl.cpp @@ -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. diff --git a/paymentservice/src/main.cpp b/paymentservice/src/main.cpp index d9aec983..d1238de0 100644 --- a/paymentservice/src/main.cpp +++ b/paymentservice/src/main.cpp @@ -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. diff --git a/persistentobjects/assets/CreatePage.qml b/persistentobjects/assets/CreatePage.qml index 5d871240..d9deca34 100644 --- a/persistentobjects/assets/CreatePage.qml +++ b/persistentobjects/assets/CreatePage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { titleBar: TitleBar { diff --git a/persistentobjects/assets/DeletePage.qml b/persistentobjects/assets/DeletePage.qml index 93a9166b..cb2e951c 100644 --- a/persistentobjects/assets/DeletePage.qml +++ b/persistentobjects/assets/DeletePage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { titleBar: TitleBar { diff --git a/persistentobjects/assets/ListPage.qml b/persistentobjects/assets/ListPage.qml index a8d52ba9..b0c4eed8 100644 --- a/persistentobjects/assets/ListPage.qml +++ b/persistentobjects/assets/ListPage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import PersistentObjectsLib 1.0 // needed to access enums of App class Page { diff --git a/persistentobjects/assets/UpdatePage.qml b/persistentobjects/assets/UpdatePage.qml index 94e8e8e3..4c8f3d20 100644 --- a/persistentobjects/assets/UpdatePage.qml +++ b/persistentobjects/assets/UpdatePage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { titleBar: TitleBar { diff --git a/persistentobjects/assets/main.qml b/persistentobjects/assets/main.qml index 94787164..6a6d50b3 100644 --- a/persistentobjects/assets/main.qml +++ b/persistentobjects/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // The root node has to inherit from AbstractPane -- in this case a TabbedPane. // There is always only ONE root not in a QML file and it is typically diff --git a/persistentobjects/src/FileStorage.cpp b/persistentobjects/src/FileStorage.cpp index 8a21e09e..2b2f4ea5 100644 --- a/persistentobjects/src/FileStorage.cpp +++ b/persistentobjects/src/FileStorage.cpp @@ -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. diff --git a/persistentobjects/src/Person.cpp b/persistentobjects/src/Person.cpp index 77b186c7..a1d59fbf 100644 --- a/persistentobjects/src/Person.cpp +++ b/persistentobjects/src/Person.cpp @@ -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. diff --git a/persistentobjects/src/SettingsStorage.cpp b/persistentobjects/src/SettingsStorage.cpp index a1a8d4ea..b4348576 100644 --- a/persistentobjects/src/SettingsStorage.cpp +++ b/persistentobjects/src/SettingsStorage.cpp @@ -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. diff --git a/persistentobjects/src/Storage.cpp b/persistentobjects/src/Storage.cpp index f6e0c547..3dad59d3 100644 --- a/persistentobjects/src/Storage.cpp +++ b/persistentobjects/src/Storage.cpp @@ -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. diff --git a/persistentobjects/src/app.cpp b/persistentobjects/src/app.cpp index ebd64e3b..baecab68 100644 --- a/persistentobjects/src/app.cpp +++ b/persistentobjects/src/app.cpp @@ -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. diff --git a/persistentobjects/src/main.cpp b/persistentobjects/src/main.cpp index 1fd8265e..7284730a 100644 --- a/persistentobjects/src/main.cpp +++ b/persistentobjects/src/main.cpp @@ -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. diff --git a/placepicker/assets/720x720/PlacepickerScrollView.qml b/placepicker/assets/720x720/PlacepickerScrollView.qml index add49334..2ffa9029 100644 --- a/placepicker/assets/720x720/PlacepickerScrollView.qml +++ b/placepicker/assets/720x720/PlacepickerScrollView.qml @@ -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 diff --git a/placepicker/assets/FieldLabel.qml b/placepicker/assets/FieldLabel.qml index 6802d9cf..1308ca76 100644 --- a/placepicker/assets/FieldLabel.qml +++ b/placepicker/assets/FieldLabel.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 //! [0] Container { diff --git a/placepicker/assets/FieldNumber.qml b/placepicker/assets/FieldNumber.qml index 222a353e..70892757 100644 --- a/placepicker/assets/FieldNumber.qml +++ b/placepicker/assets/FieldNumber.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { id: root diff --git a/placepicker/assets/PlacepickerScrollView.qml b/placepicker/assets/PlacepickerScrollView.qml index 35065345..5585d06f 100644 --- a/placepicker/assets/PlacepickerScrollView.qml +++ b/placepicker/assets/PlacepickerScrollView.qml @@ -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 diff --git a/placepicker/assets/main.qml b/placepicker/assets/main.qml index 295196b3..63f73153 100644 --- a/placepicker/assets/main.qml +++ b/placepicker/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.cascades.places 1.0 Page { diff --git a/placepicker/src/main.cpp b/placepicker/src/main.cpp index ddd27e6d..8ead5740 100644 --- a/placepicker/src/main.cpp +++ b/placepicker/src/main.cpp @@ -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. diff --git a/pushCollector/10.0/pushCollector/src/PushContentController.cpp b/pushCollector/10.0/pushCollector/src/PushContentController.cpp index cfe829d2..9e2f7f4a 100644 --- a/pushCollector/10.0/pushCollector/src/PushContentController.cpp +++ b/pushCollector/10.0/pushCollector/src/PushContentController.cpp @@ -1,5 +1,5 @@ /* -* 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. diff --git a/pushCollector/10.0/pushCollector/src/PushContentController.hpp b/pushCollector/10.0/pushCollector/src/PushContentController.hpp index 215ef33f..6fc6f6de 100644 --- a/pushCollector/10.0/pushCollector/src/PushContentController.hpp +++ b/pushCollector/10.0/pushCollector/src/PushContentController.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/app.cpp b/pushCollector/10.0/pushCollector/src/app.cpp index a2f0fa38..683946e8 100644 --- a/pushCollector/10.0/pushCollector/src/app.cpp +++ b/pushCollector/10.0/pushCollector/src/app.cpp @@ -1,5 +1,5 @@ /* -* 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. diff --git a/pushCollector/10.0/pushCollector/src/app.hpp b/pushCollector/10.0/pushCollector/src/app.hpp index f0c065da..12772f6c 100644 --- a/pushCollector/10.0/pushCollector/src/app.hpp +++ b/pushCollector/10.0/pushCollector/src/app.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/BaseDAO.cpp b/pushCollector/10.0/pushCollector/src/dao/BaseDAO.cpp index a69a7b3d..9efb4678 100644 --- a/pushCollector/10.0/pushCollector/src/dao/BaseDAO.cpp +++ b/pushCollector/10.0/pushCollector/src/dao/BaseDAO.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/BaseDAO.hpp b/pushCollector/10.0/pushCollector/src/dao/BaseDAO.hpp index 08f65129..09ea91eb 100644 --- a/pushCollector/10.0/pushCollector/src/dao/BaseDAO.hpp +++ b/pushCollector/10.0/pushCollector/src/dao/BaseDAO.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/ConfigurationDAO.cpp b/pushCollector/10.0/pushCollector/src/dao/ConfigurationDAO.cpp index e11ee5e8..2cb2bf1a 100644 --- a/pushCollector/10.0/pushCollector/src/dao/ConfigurationDAO.cpp +++ b/pushCollector/10.0/pushCollector/src/dao/ConfigurationDAO.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/ConfigurationDAO.hpp b/pushCollector/10.0/pushCollector/src/dao/ConfigurationDAO.hpp index d0ac5482..14d4b067 100644 --- a/pushCollector/10.0/pushCollector/src/dao/ConfigurationDAO.hpp +++ b/pushCollector/10.0/pushCollector/src/dao/ConfigurationDAO.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/PushDAO.cpp b/pushCollector/10.0/pushCollector/src/dao/PushDAO.cpp index 3664cc3d..ee52e4fe 100644 --- a/pushCollector/10.0/pushCollector/src/dao/PushDAO.cpp +++ b/pushCollector/10.0/pushCollector/src/dao/PushDAO.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/PushDAO.hpp b/pushCollector/10.0/pushCollector/src/dao/PushDAO.hpp index ba4ec1b4..4709441e 100644 --- a/pushCollector/10.0/pushCollector/src/dao/PushDAO.hpp +++ b/pushCollector/10.0/pushCollector/src/dao/PushDAO.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/PushHistoryDAO.cpp b/pushCollector/10.0/pushCollector/src/dao/PushHistoryDAO.cpp index 93ac3ee1..cffb6cfa 100644 --- a/pushCollector/10.0/pushCollector/src/dao/PushHistoryDAO.cpp +++ b/pushCollector/10.0/pushCollector/src/dao/PushHistoryDAO.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/PushHistoryDAO.hpp b/pushCollector/10.0/pushCollector/src/dao/PushHistoryDAO.hpp index 0fcbe8c0..5fd76fca 100644 --- a/pushCollector/10.0/pushCollector/src/dao/PushHistoryDAO.hpp +++ b/pushCollector/10.0/pushCollector/src/dao/PushHistoryDAO.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/UserDAO.cpp b/pushCollector/10.0/pushCollector/src/dao/UserDAO.cpp index 89297ec1..89c84706 100644 --- a/pushCollector/10.0/pushCollector/src/dao/UserDAO.cpp +++ b/pushCollector/10.0/pushCollector/src/dao/UserDAO.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/dao/UserDAO.hpp b/pushCollector/10.0/pushCollector/src/dao/UserDAO.hpp index b785683e..bc450f85 100644 --- a/pushCollector/10.0/pushCollector/src/dao/UserDAO.hpp +++ b/pushCollector/10.0/pushCollector/src/dao/UserDAO.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/main.cpp b/pushCollector/10.0/pushCollector/src/main.cpp index 7e066e22..4ab6a69f 100644 --- a/pushCollector/10.0/pushCollector/src/main.cpp +++ b/pushCollector/10.0/pushCollector/src/main.cpp @@ -1,5 +1,5 @@ /* -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/ConfigurationService.cpp b/pushCollector/10.0/pushCollector/src/service/ConfigurationService.cpp index b4827070..90ed3f57 100644 --- a/pushCollector/10.0/pushCollector/src/service/ConfigurationService.cpp +++ b/pushCollector/10.0/pushCollector/src/service/ConfigurationService.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/ConfigurationService.hpp b/pushCollector/10.0/pushCollector/src/service/ConfigurationService.hpp index c9092220..2108c9c6 100644 --- a/pushCollector/10.0/pushCollector/src/service/ConfigurationService.hpp +++ b/pushCollector/10.0/pushCollector/src/service/ConfigurationService.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/PushHandler.cpp b/pushCollector/10.0/pushCollector/src/service/PushHandler.cpp index c049dee2..f717c166 100644 --- a/pushCollector/10.0/pushCollector/src/service/PushHandler.cpp +++ b/pushCollector/10.0/pushCollector/src/service/PushHandler.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/PushHandler.hpp b/pushCollector/10.0/pushCollector/src/service/PushHandler.hpp index 1a931ffe..f1584e2c 100644 --- a/pushCollector/10.0/pushCollector/src/service/PushHandler.hpp +++ b/pushCollector/10.0/pushCollector/src/service/PushHandler.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/PushNotificationService.cpp b/pushCollector/10.0/pushCollector/src/service/PushNotificationService.cpp index 06f9925b..185012a7 100644 --- a/pushCollector/10.0/pushCollector/src/service/PushNotificationService.cpp +++ b/pushCollector/10.0/pushCollector/src/service/PushNotificationService.cpp @@ -1,5 +1,5 @@ /* -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/PushNotificationService.hpp b/pushCollector/10.0/pushCollector/src/service/PushNotificationService.hpp index 338aa2e3..0c134c1d 100644 --- a/pushCollector/10.0/pushCollector/src/service/PushNotificationService.hpp +++ b/pushCollector/10.0/pushCollector/src/service/PushNotificationService.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/RegisterService.cpp b/pushCollector/10.0/pushCollector/src/service/RegisterService.cpp index 686fd50c..0b49835a 100644 --- a/pushCollector/10.0/pushCollector/src/service/RegisterService.cpp +++ b/pushCollector/10.0/pushCollector/src/service/RegisterService.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/RegisterService.hpp b/pushCollector/10.0/pushCollector/src/service/RegisterService.hpp index b3704bf1..de044dbb 100644 --- a/pushCollector/10.0/pushCollector/src/service/RegisterService.hpp +++ b/pushCollector/10.0/pushCollector/src/service/RegisterService.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/UnregisterService.cpp b/pushCollector/10.0/pushCollector/src/service/UnregisterService.cpp index a3b3adfc..a7944ad6 100644 --- a/pushCollector/10.0/pushCollector/src/service/UnregisterService.cpp +++ b/pushCollector/10.0/pushCollector/src/service/UnregisterService.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/service/UnregisterService.hpp b/pushCollector/10.0/pushCollector/src/service/UnregisterService.hpp index e0e205f0..199f8e43 100644 --- a/pushCollector/10.0/pushCollector/src/service/UnregisterService.hpp +++ b/pushCollector/10.0/pushCollector/src/service/UnregisterService.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/vo/Configuration.cpp b/pushCollector/10.0/pushCollector/src/vo/Configuration.cpp index 126e796d..d1328d6a 100644 --- a/pushCollector/10.0/pushCollector/src/vo/Configuration.cpp +++ b/pushCollector/10.0/pushCollector/src/vo/Configuration.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/vo/Configuration.hpp b/pushCollector/10.0/pushCollector/src/vo/Configuration.hpp index 3f6f5685..645d3560 100644 --- a/pushCollector/10.0/pushCollector/src/vo/Configuration.hpp +++ b/pushCollector/10.0/pushCollector/src/vo/Configuration.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/vo/Push.cpp b/pushCollector/10.0/pushCollector/src/vo/Push.cpp index 2c423ad5..8c84ac27 100644 --- a/pushCollector/10.0/pushCollector/src/vo/Push.cpp +++ b/pushCollector/10.0/pushCollector/src/vo/Push.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/vo/Push.hpp b/pushCollector/10.0/pushCollector/src/vo/Push.hpp index d565d21c..36092752 100644 --- a/pushCollector/10.0/pushCollector/src/vo/Push.hpp +++ b/pushCollector/10.0/pushCollector/src/vo/Push.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/vo/PushHistoryItem.cpp b/pushCollector/10.0/pushCollector/src/vo/PushHistoryItem.cpp index a23d9f5c..48c6ddec 100644 --- a/pushCollector/10.0/pushCollector/src/vo/PushHistoryItem.cpp +++ b/pushCollector/10.0/pushCollector/src/vo/PushHistoryItem.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/vo/PushHistoryItem.hpp b/pushCollector/10.0/pushCollector/src/vo/PushHistoryItem.hpp index 44bb5671..d19d141d 100644 --- a/pushCollector/10.0/pushCollector/src/vo/PushHistoryItem.hpp +++ b/pushCollector/10.0/pushCollector/src/vo/PushHistoryItem.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/vo/User.cpp b/pushCollector/10.0/pushCollector/src/vo/User.cpp index 7165523c..f3ca946d 100644 --- a/pushCollector/10.0/pushCollector/src/vo/User.cpp +++ b/pushCollector/10.0/pushCollector/src/vo/User.cpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.0/pushCollector/src/vo/User.hpp b/pushCollector/10.0/pushCollector/src/vo/User.hpp index fcae33b0..72978a66 100644 --- a/pushCollector/10.0/pushCollector/src/vo/User.hpp +++ b/pushCollector/10.0/pushCollector/src/vo/User.hpp @@ -1,5 +1,5 @@ /*! -* 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. diff --git a/pushCollector/10.2/pushCollector/assets/CustomCheckBox.qml b/pushCollector/10.2/pushCollector/assets/CustomCheckBox.qml index 8987d1b0..6f2f4080 100644 --- a/pushCollector/10.2/pushCollector/assets/CustomCheckBox.qml +++ b/pushCollector/10.2/pushCollector/assets/CustomCheckBox.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // A custom checkbox that reacts on touch events on the label Container { diff --git a/pushCollector/10.2/pushCollector/assets/CustomTextField.qml b/pushCollector/10.2/pushCollector/assets/CustomTextField.qml index f3db8681..f3ab6e52 100644 --- a/pushCollector/10.2/pushCollector/assets/CustomTextField.qml +++ b/pushCollector/10.2/pushCollector/assets/CustomTextField.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // A custom text field with a label above it Container { diff --git a/pushCollector/10.2/pushCollector/assets/PushContent.qml b/pushCollector/10.2/pushCollector/assets/PushContent.qml index 5bb10310..7b17c558 100644 --- a/pushCollector/10.2/pushCollector/assets/PushContent.qml +++ b/pushCollector/10.2/pushCollector/assets/PushContent.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // The control that shows the content of a push object Container { diff --git a/pushCollector/10.2/pushCollector/assets/SheetConfig.qml b/pushCollector/10.2/pushCollector/assets/SheetConfig.qml index c333d34e..3c24b8ac 100644 --- a/pushCollector/10.2/pushCollector/assets/SheetConfig.qml +++ b/pushCollector/10.2/pushCollector/assets/SheetConfig.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 // The page to configure the settings of the notification service diff --git a/pushCollector/10.2/pushCollector/assets/main.qml b/pushCollector/10.2/pushCollector/assets/main.qml index 593c95f9..15dd64dd 100644 --- a/pushCollector/10.2/pushCollector/assets/main.qml +++ b/pushCollector/10.2/pushCollector/assets/main.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.system 1.0 NavigationPane { diff --git a/pushCollector/10.2/pushCollector/src/PushContentController.cpp b/pushCollector/10.2/pushCollector/src/PushContentController.cpp index dfd04f62..ca7ccc7e 100644 --- a/pushCollector/10.2/pushCollector/src/PushContentController.cpp +++ b/pushCollector/10.2/pushCollector/src/PushContentController.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollector/src/PushContentController.hpp b/pushCollector/10.2/pushCollector/src/PushContentController.hpp index 7fc186cf..519a859c 100644 --- a/pushCollector/10.2/pushCollector/src/PushContentController.hpp +++ b/pushCollector/10.2/pushCollector/src/PushContentController.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollector/src/app.cpp b/pushCollector/10.2/pushCollector/src/app.cpp index 4d35e03b..9e6b110c 100644 --- a/pushCollector/10.2/pushCollector/src/app.cpp +++ b/pushCollector/10.2/pushCollector/src/app.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollector/src/app.hpp b/pushCollector/10.2/pushCollector/src/app.hpp index 625b4fca..1192f1d9 100644 --- a/pushCollector/10.2/pushCollector/src/app.hpp +++ b/pushCollector/10.2/pushCollector/src/app.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollector/src/main.cpp b/pushCollector/10.2/pushCollector/src/main.cpp index 9c62dce8..2c2d9724 100644 --- a/pushCollector/10.2/pushCollector/src/main.cpp +++ b/pushCollector/10.2/pushCollector/src/main.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/Global.hpp b/pushCollector/10.2/pushCollectorCommon/public/Global.hpp index a5616ddc..3c821191 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/Global.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/Global.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/PushUtility.hpp b/pushCollector/10.2/pushCollectorCommon/public/PushUtility.hpp index 2dd43b98..dd655dc5 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/PushUtility.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/PushUtility.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/dao/BaseDAO.hpp b/pushCollector/10.2/pushCollectorCommon/public/dao/BaseDAO.hpp index 90ee30f8..5a5d4e20 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/dao/BaseDAO.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/dao/BaseDAO.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/dao/ConfigurationDAO.hpp b/pushCollector/10.2/pushCollectorCommon/public/dao/ConfigurationDAO.hpp index ef7f450c..7b6b7097 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/dao/ConfigurationDAO.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/dao/ConfigurationDAO.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/dao/MessageDAO.hpp b/pushCollector/10.2/pushCollectorCommon/public/dao/MessageDAO.hpp index 93a0c705..fe50eec3 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/dao/MessageDAO.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/dao/MessageDAO.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/dao/PushDAO.hpp b/pushCollector/10.2/pushCollectorCommon/public/dao/PushDAO.hpp index 33936e94..e86d55d1 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/dao/PushDAO.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/dao/PushDAO.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/dao/PushHistoryDAO.hpp b/pushCollector/10.2/pushCollectorCommon/public/dao/PushHistoryDAO.hpp index 60d31de8..b1841c9e 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/dao/PushHistoryDAO.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/dao/PushHistoryDAO.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/dao/UserDAO.hpp b/pushCollector/10.2/pushCollectorCommon/public/dao/UserDAO.hpp index c7ac70c2..e7844461 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/dao/UserDAO.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/dao/UserDAO.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/service/ConfigurationService.hpp b/pushCollector/10.2/pushCollectorCommon/public/service/ConfigurationService.hpp index e9e9b14e..28a64780 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/service/ConfigurationService.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/service/ConfigurationService.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/service/MessageReader.hpp b/pushCollector/10.2/pushCollectorCommon/public/service/MessageReader.hpp index 8e7c47e2..4fafe91a 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/service/MessageReader.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/service/MessageReader.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/service/MessageWriter.hpp b/pushCollector/10.2/pushCollectorCommon/public/service/MessageWriter.hpp index 34073068..c007df61 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/service/MessageWriter.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/service/MessageWriter.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/service/PushHandler.hpp b/pushCollector/10.2/pushCollectorCommon/public/service/PushHandler.hpp index 8e405ea3..f24a4102 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/service/PushHandler.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/service/PushHandler.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/service/RegisterService.hpp b/pushCollector/10.2/pushCollectorCommon/public/service/RegisterService.hpp index d2088e7f..630635ed 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/service/RegisterService.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/service/RegisterService.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/service/UnregisterService.hpp b/pushCollector/10.2/pushCollectorCommon/public/service/UnregisterService.hpp index 858c29e2..dc44935e 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/service/UnregisterService.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/service/UnregisterService.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/vo/CommandMessage.hpp b/pushCollector/10.2/pushCollectorCommon/public/vo/CommandMessage.hpp index df5ddf3a..2d1f2db6 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/vo/CommandMessage.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/vo/CommandMessage.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/vo/Configuration.hpp b/pushCollector/10.2/pushCollectorCommon/public/vo/Configuration.hpp index a7db46d6..15b21a11 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/vo/Configuration.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/vo/Configuration.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/vo/Push.hpp b/pushCollector/10.2/pushCollectorCommon/public/vo/Push.hpp index 33d2045f..1f11d01d 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/vo/Push.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/vo/Push.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/vo/PushHistoryItem.hpp b/pushCollector/10.2/pushCollectorCommon/public/vo/PushHistoryItem.hpp index 64f6c09c..46d6dba1 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/vo/PushHistoryItem.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/vo/PushHistoryItem.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/vo/StatusMessage.hpp b/pushCollector/10.2/pushCollectorCommon/public/vo/StatusMessage.hpp index 5a9f328b..ae78de58 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/vo/StatusMessage.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/vo/StatusMessage.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/public/vo/User.hpp b/pushCollector/10.2/pushCollectorCommon/public/vo/User.hpp index b697a19b..b9f343b2 100644 --- a/pushCollector/10.2/pushCollectorCommon/public/vo/User.hpp +++ b/pushCollector/10.2/pushCollectorCommon/public/vo/User.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/PushUtility.cpp b/pushCollector/10.2/pushCollectorCommon/src/PushUtility.cpp index 3606a3b8..35ad89d4 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/PushUtility.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/PushUtility.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/dao/BaseDAO.cpp b/pushCollector/10.2/pushCollectorCommon/src/dao/BaseDAO.cpp index d277679f..37a8cdbc 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/dao/BaseDAO.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/dao/BaseDAO.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/dao/ConfigurationDAO.cpp b/pushCollector/10.2/pushCollectorCommon/src/dao/ConfigurationDAO.cpp index f0631710..dc687328 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/dao/ConfigurationDAO.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/dao/ConfigurationDAO.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/dao/MessageDAO.cpp b/pushCollector/10.2/pushCollectorCommon/src/dao/MessageDAO.cpp index 294ffcff..6fd751e2 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/dao/MessageDAO.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/dao/MessageDAO.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/dao/PushDAO.cpp b/pushCollector/10.2/pushCollectorCommon/src/dao/PushDAO.cpp index 96b069e7..1db45f48 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/dao/PushDAO.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/dao/PushDAO.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/dao/PushHistoryDAO.cpp b/pushCollector/10.2/pushCollectorCommon/src/dao/PushHistoryDAO.cpp index 3bf56ad6..3b323ee4 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/dao/PushHistoryDAO.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/dao/PushHistoryDAO.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/dao/UserDAO.cpp b/pushCollector/10.2/pushCollectorCommon/src/dao/UserDAO.cpp index 270477af..fd4e64e3 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/dao/UserDAO.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/dao/UserDAO.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/service/ConfigurationService.cpp b/pushCollector/10.2/pushCollectorCommon/src/service/ConfigurationService.cpp index 3c79cfa3..afa20e07 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/service/ConfigurationService.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/service/ConfigurationService.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/service/MessageReader.cpp b/pushCollector/10.2/pushCollectorCommon/src/service/MessageReader.cpp index 855259e4..0e5d0b10 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/service/MessageReader.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/service/MessageReader.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/service/MessageWriter.cpp b/pushCollector/10.2/pushCollectorCommon/src/service/MessageWriter.cpp index 224d093d..1424d56e 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/service/MessageWriter.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/service/MessageWriter.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/service/PushHandler.cpp b/pushCollector/10.2/pushCollectorCommon/src/service/PushHandler.cpp index b60b614a..b1587903 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/service/PushHandler.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/service/PushHandler.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/service/RegisterService.cpp b/pushCollector/10.2/pushCollectorCommon/src/service/RegisterService.cpp index 32b99659..b6de1fd5 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/service/RegisterService.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/service/RegisterService.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/service/UnregisterService.cpp b/pushCollector/10.2/pushCollectorCommon/src/service/UnregisterService.cpp index 77553ce7..dbfb7816 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/service/UnregisterService.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/service/UnregisterService.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/vo/CommandMessage.cpp b/pushCollector/10.2/pushCollectorCommon/src/vo/CommandMessage.cpp index bb49865e..a2c836d6 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/vo/CommandMessage.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/vo/CommandMessage.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/vo/Configuration.cpp b/pushCollector/10.2/pushCollectorCommon/src/vo/Configuration.cpp index 09b0a360..22a181ff 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/vo/Configuration.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/vo/Configuration.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/vo/Push.cpp b/pushCollector/10.2/pushCollectorCommon/src/vo/Push.cpp index b738f149..4c9b39d0 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/vo/Push.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/vo/Push.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/vo/PushHistoryItem.cpp b/pushCollector/10.2/pushCollectorCommon/src/vo/PushHistoryItem.cpp index e7d5ab3c..b3bcd6e3 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/vo/PushHistoryItem.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/vo/PushHistoryItem.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/vo/StatusMessage.cpp b/pushCollector/10.2/pushCollectorCommon/src/vo/StatusMessage.cpp index dea738bc..7b01ade1 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/vo/StatusMessage.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/vo/StatusMessage.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorCommon/src/vo/User.cpp b/pushCollector/10.2/pushCollectorCommon/src/vo/User.cpp index 10e8ba50..b3a52e2e 100644 --- a/pushCollector/10.2/pushCollectorCommon/src/vo/User.cpp +++ b/pushCollector/10.2/pushCollectorCommon/src/vo/User.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorHeadless/src/AppHeadless.cpp b/pushCollector/10.2/pushCollectorHeadless/src/AppHeadless.cpp index ba11e3f7..9dbeb62c 100644 --- a/pushCollector/10.2/pushCollectorHeadless/src/AppHeadless.cpp +++ b/pushCollector/10.2/pushCollectorHeadless/src/AppHeadless.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorHeadless/src/AppHeadless.hpp b/pushCollector/10.2/pushCollectorHeadless/src/AppHeadless.hpp index f796b0b9..3652badb 100644 --- a/pushCollector/10.2/pushCollectorHeadless/src/AppHeadless.hpp +++ b/pushCollector/10.2/pushCollectorHeadless/src/AppHeadless.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorHeadless/src/PushNotificationService.cpp b/pushCollector/10.2/pushCollectorHeadless/src/PushNotificationService.cpp index eb2d8710..4f077a85 100644 --- a/pushCollector/10.2/pushCollectorHeadless/src/PushNotificationService.cpp +++ b/pushCollector/10.2/pushCollectorHeadless/src/PushNotificationService.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorHeadless/src/PushNotificationService.hpp b/pushCollector/10.2/pushCollectorHeadless/src/PushNotificationService.hpp index 0fdbcdf9..f44adcd2 100644 --- a/pushCollector/10.2/pushCollectorHeadless/src/PushNotificationService.hpp +++ b/pushCollector/10.2/pushCollectorHeadless/src/PushNotificationService.hpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/pushCollector/10.2/pushCollectorHeadless/src/main.cpp b/pushCollector/10.2/pushCollectorHeadless/src/main.cpp index 6cfa857c..3fb8b811 100644 --- a/pushCollector/10.2/pushCollectorHeadless/src/main.cpp +++ b/pushCollector/10.2/pushCollectorHeadless/src/main.cpp @@ -1,5 +1,5 @@ /*! -* Copyright (c) 2012, 2013 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. diff --git a/repeater/assets/CustomPage.qml b/repeater/assets/CustomPage.qml index 68dc2102..bac22644 100644 --- a/repeater/assets/CustomPage.qml +++ b/repeater/assets/CustomPage.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { layout: DockLayout {} diff --git a/repeater/assets/main.qml b/repeater/assets/main.qml index 4870a3ee..62fa440d 100644 --- a/repeater/assets/main.qml +++ b/repeater/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import Components 1.0 TabbedPane { diff --git a/repeater/src/Repeater.cpp b/repeater/src/Repeater.cpp index 2b82fb5d..49fa8aff 100644 --- a/repeater/src/Repeater.cpp +++ b/repeater/src/Repeater.cpp @@ -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. diff --git a/repeater/src/SqlModel.cpp b/repeater/src/SqlModel.cpp index f7fc0a62..86216611 100644 --- a/repeater/src/SqlModel.cpp +++ b/repeater/src/SqlModel.cpp @@ -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. diff --git a/repeater/src/main.cpp b/repeater/src/main.cpp index b542b235..9562017a 100644 --- a/repeater/src/main.cpp +++ b/repeater/src/main.cpp @@ -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. diff --git a/routemapinvoker/assets/main.qml b/routemapinvoker/assets/main.qml index 576e0f72..053cd6a3 100644 --- a/routemapinvoker/assets/main.qml +++ b/routemapinvoker/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.platform 1.0 import bb.data 1.0 @@ -99,8 +99,8 @@ Page { // Use fixed coordinates for start position ... // Note: This does not work with current BB10 version but will work with future ones - startLatitude: 42.814513 - startLongitude: -73.94206 + //startLatitude: 42.814513 + //startLongitude: -73.94206 // ... and center the map view around them. centerLatitude: startLatitude diff --git a/routemapinvoker/src/main.cpp b/routemapinvoker/src/main.cpp index fb976849..52651641 100644 --- a/routemapinvoker/src/main.cpp +++ b/routemapinvoker/src/main.cpp @@ -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. diff --git a/rssnews/assets/ArticleItem.qml b/rssnews/assets/ArticleItem.qml index 76fcc0f7..28cc3bd8 100644 --- a/rssnews/assets/ArticleItem.qml +++ b/rssnews/assets/ArticleItem.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Container { property alias title : titleLabel.text diff --git a/rssnews/assets/main.qml b/rssnews/assets/main.qml index e20fdae4..b0ee0369 100644 --- a/rssnews/assets/main.qml +++ b/rssnews/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.data 1.0 NavigationPane { diff --git a/rssnews/src/main.cpp b/rssnews/src/main.cpp index 1721f683..cdff5950 100644 --- a/rssnews/src/main.cpp +++ b/rssnews/src/main.cpp @@ -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. diff --git a/scratchpad/assets/720x720/ScratchpadScrollView.qml b/scratchpad/assets/720x720/ScratchpadScrollView.qml index add49334..2ffa9029 100644 --- a/scratchpad/assets/720x720/ScratchpadScrollView.qml +++ b/scratchpad/assets/720x720/ScratchpadScrollView.qml @@ -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 diff --git a/scratchpad/assets/ScratchpadScrollView.qml b/scratchpad/assets/ScratchpadScrollView.qml index 35065345..5585d06f 100644 --- a/scratchpad/assets/ScratchpadScrollView.qml +++ b/scratchpad/assets/ScratchpadScrollView.qml @@ -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 diff --git a/scratchpad/assets/main.qml b/scratchpad/assets/main.qml index 6946245e..85e07577 100644 --- a/scratchpad/assets/main.qml +++ b/scratchpad/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { @@ -98,22 +98,29 @@ Page { //! [1] //! [2] TextField { + id: rowText topMargin: 50 hintText: qsTr("Enter # rows (1 or more) of replicants") inputMode: TextFieldInputMode.NumbersAndPunctuation - - onTextChanged: { - _scratchpad.rows = text + + input { + submitKey: SubmitKey.EnterKey + onSubmitted: { + _scratchpad.rows = rowText.text + } } } TextField { + id: columnText hintText: qsTr("Enter # columns (1 or more) of replicants") inputMode: TextFieldInputMode.NumbersAndPunctuation - - onTextChanged: { - _scratchpad.columns = text + input { + submitKey: SubmitKey.EnterKey + onSubmitted: { + _scratchpad.columns = columnText.text + } } } //! [2] diff --git a/scratchpad/bar-descriptor.xml b/scratchpad/bar-descriptor.xml index f8b15d5f..5a999853 100644 --- a/scratchpad/bar-descriptor.xml +++ b/scratchpad/bar-descriptor.xml @@ -52,7 +52,7 @@ - Stuart MacMartin + Example Inc. diff --git a/scratchpad/src/app.cpp b/scratchpad/src/app.cpp index 10ab4fb2..8b457169 100644 --- a/scratchpad/src/app.cpp +++ b/scratchpad/src/app.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 Stuart MacMartin. +/* Copyright (c) 2012, 2013 Stuart MacMartin. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A diff --git a/scratchpad/src/draw.cpp b/scratchpad/src/draw.cpp index 3442e545..e4911076 100644 --- a/scratchpad/src/draw.cpp +++ b/scratchpad/src/draw.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 Stuart MacMartin. +/* Copyright (c) 2012, 2013 Stuart MacMartin. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A diff --git a/scratchpad/src/main.cpp b/scratchpad/src/main.cpp index 09ea9164..9b89f74c 100644 --- a/scratchpad/src/main.cpp +++ b/scratchpad/src/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 Stuart MacMartin. +/* Copyright (c) 2012, 2013 Stuart MacMartin. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A diff --git a/soapxml/assets/controls/NetworkActivity.qml b/soapxml/assets/controls/NetworkActivity.qml index 3b5650b2..81733da1 100644 --- a/soapxml/assets/controls/NetworkActivity.qml +++ b/soapxml/assets/controls/NetworkActivity.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 /** * This is a custom control to display network activity diff --git a/soapxml/assets/main.qml b/soapxml/assets/main.qml index de756c78..4bc1b4db 100644 --- a/soapxml/assets/main.qml +++ b/soapxml/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import "controls" import wsf.cdyne.com.WeatherWS 1.0 diff --git a/soapxml/src/WeatherService.cpp b/soapxml/src/WeatherService.cpp index f32cf7b0..ec4dc786 100644 --- a/soapxml/src/WeatherService.cpp +++ b/soapxml/src/WeatherService.cpp @@ -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. diff --git a/soapxml/src/main.cpp b/soapxml/src/main.cpp index 20cc4cb4..db1caf4b 100644 --- a/soapxml/src/main.cpp +++ b/soapxml/src/main.cpp @@ -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. diff --git a/soapxml/src/qtsoap/qtsoap.cpp b/soapxml/src/qtsoap/qtsoap.cpp index 508e7bd0..8c7b7cd9 100644 --- a/soapxml/src/qtsoap/qtsoap.cpp +++ b/soapxml/src/qtsoap/qtsoap.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010, 2013 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** ** Contact: Nokia Corporation (qt-info@nokia.com) diff --git a/socialinvocation/assets/GeneralBlock.qml b/socialinvocation/assets/GeneralBlock.qml index c6867bbd..c45c38c5 100644 --- a/socialinvocation/assets/GeneralBlock.qml +++ b/socialinvocation/assets/GeneralBlock.qml @@ -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 // The general Status Update text field that is shown on each tab //! [0] diff --git a/socialinvocation/assets/ImageSelectionBlock.qml b/socialinvocation/assets/ImageSelectionBlock.qml index dbc7a8ed..d5deaa0a 100644 --- a/socialinvocation/assets/ImageSelectionBlock.qml +++ b/socialinvocation/assets/ImageSelectionBlock.qml @@ -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 import bb.cascades.pickers 1.0 // Select an image to share diff --git a/socialinvocation/assets/main.qml b/socialinvocation/assets/main.qml index e8527474..322e19b8 100644 --- a/socialinvocation/assets/main.qml +++ b/socialinvocation/assets/main.qml @@ -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 TabbedPane { showTabsOnActionBar: false diff --git a/socialinvocation/src/SocialInvocation.cpp b/socialinvocation/src/SocialInvocation.cpp index 91abcb18..4a4f0e43 100644 --- a/socialinvocation/src/SocialInvocation.cpp +++ b/socialinvocation/src/SocialInvocation.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/socialinvocation/src/main.cpp b/socialinvocation/src/main.cpp index 4a0d74d3..cdb4c473 100644 --- a/socialinvocation/src/main.cpp +++ b/socialinvocation/src/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/systemsound/assets/main.qml b/systemsound/assets/main.qml index c7960edc..1bf09cd0 100644 --- a/systemsound/assets/main.qml +++ b/systemsound/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 import bb.multimedia 1.0 Page { diff --git a/systemsound/src/main.cpp b/systemsound/src/main.cpp index 57738c6c..82b76bd0 100644 --- a/systemsound/src/main.cpp +++ b/systemsound/src/main.cpp @@ -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. diff --git a/tossgame/assets/main.qml b/tossgame/assets/main.qml index 13c15b7a..5c16e343 100644 --- a/tossgame/assets/main.qml +++ b/tossgame/assets/main.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import bb.cascades 1.2 +import bb.cascades 1.0 import Utils 1.0 Page { diff --git a/tossgame/src/TossGame.cpp b/tossgame/src/TossGame.cpp index ac94c190..c48d7cc6 100644 --- a/tossgame/src/TossGame.cpp +++ b/tossgame/src/TossGame.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** - ** Portions Copyright (C) 2012 Research In Motion Limited. + ** Portions Copyright (C) 2012, 2013 BlackBerry Limited. ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. - ** Contact: Research In Motion Ltd. (http://www.rim.com/company/contact/) + ** Contact: BlackBerry Ltd. (http://www.blackberry.com/company/contact/) ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the examples of the BB10 Platform and is derived @@ -20,7 +20,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. - ** * Neither the name of Research In Motion, nor the name of Nokia + ** * Neither the name of BlackBerry, nor the name of Nokia ** Corporation and its Subsidiary(-ies), nor the names of its ** contributors may be used to endorse or promote products ** derived from this software without specific prior written diff --git a/tossgame/src/main.cpp b/tossgame/src/main.cpp index 7debb199..dbca0da7 100644 --- a/tossgame/src/main.cpp +++ b/tossgame/src/main.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** - ** Portions Copyright (C) 2012 Research In Motion Limited. + ** Portions Copyright (C) 2012, 2013 BlackBerry Limited. ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. - ** Contact: Research In Motion Ltd. (http://www.rim.com/company/contact/) + ** Contact: BlackBerry Ltd. (http://www.blackberry.com/company/contact/) ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the examples of the BB10 Platform and is derived @@ -20,7 +20,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. - ** * Neither the name of Research In Motion, nor the name of Nokia + ** * Neither the name of BlackBerry, nor the name of Nokia ** Corporation and its Subsidiary(-ies), nor the names of its ** contributors may be used to endorse or promote products ** derived from this software without specific prior written diff --git a/twittertimeline/assets/CustomTimelineView.qml b/twittertimeline/assets/CustomTimelineView.qml index 07415729..98e0027a 100644 --- a/twittertimeline/assets/CustomTimelineView.qml +++ b/twittertimeline/assets/CustomTimelineView.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/twittertimeline/assets/StandardTimelineView.qml b/twittertimeline/assets/StandardTimelineView.qml index 7710ba77..a68772d9 100644 --- a/twittertimeline/assets/StandardTimelineView.qml +++ b/twittertimeline/assets/StandardTimelineView.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/twittertimeline/assets/main.qml b/twittertimeline/assets/main.qml index ddc4ef9c..6cf2d5e7 100644 --- a/twittertimeline/assets/main.qml +++ b/twittertimeline/assets/main.qml @@ -14,7 +14,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 NavigationPane { id: navigationPane diff --git a/twittertimeline/src/TwitterRequest.cpp b/twittertimeline/src/TwitterRequest.cpp index 6209580e..e5ef953a 100644 --- a/twittertimeline/src/TwitterRequest.cpp +++ b/twittertimeline/src/TwitterRequest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 Research In Motion Limited. + * Copyright (c) 2011-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. diff --git a/twittertimeline/src/app.cpp b/twittertimeline/src/app.cpp index 328c0c73..178e41ca 100644 --- a/twittertimeline/src/app.cpp +++ b/twittertimeline/src/app.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 Research In Motion Limited. + * Copyright (c) 2011-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. diff --git a/twittertimeline/src/main.cpp b/twittertimeline/src/main.cpp index 3a5c155f..8d37a417 100644 --- a/twittertimeline/src/main.cpp +++ b/twittertimeline/src/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 Research In Motion Limited. + * Copyright (c) 2011-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. diff --git a/vegetablesdatamodel/assets/main.qml b/vegetablesdatamodel/assets/main.qml index 00aa9194..10c2698a 100644 --- a/vegetablesdatamodel/assets/main.qml +++ b/vegetablesdatamodel/assets/main.qml @@ -13,7 +13,7 @@ * limitations under the License. */ -import bb.cascades 1.2 +import bb.cascades 1.0 Page { Container { diff --git a/vegetablesdatamodel/src/main.cpp b/vegetablesdatamodel/src/main.cpp index fef77fec..09cdbdff 100644 --- a/vegetablesdatamodel/src/main.cpp +++ b/vegetablesdatamodel/src/main.cpp @@ -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. diff --git a/vegetablesdatamodel/src/vegetablesdatamodel.cpp b/vegetablesdatamodel/src/vegetablesdatamodel.cpp index 340a722e..f91f9198 100644 --- a/vegetablesdatamodel/src/vegetablesdatamodel.cpp +++ b/vegetablesdatamodel/src/vegetablesdatamodel.cpp @@ -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. diff --git a/webmapview/assets/Map.qml b/webmapview/assets/Map.qml index 153d28fe..fe844710 100644 --- a/webmapview/assets/Map.qml +++ b/webmapview/assets/Map.qml @@ -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 Container { id: root diff --git a/webmapview/assets/main.qml b/webmapview/assets/main.qml index 91da8c47..436c5944 100644 --- a/webmapview/assets/main.qml +++ b/webmapview/assets/main.qml @@ -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 import com.example.webmapview 1.0 Page { diff --git a/webmapview/src/WebMaps.cpp b/webmapview/src/WebMaps.cpp index c271a529..e4be392d 100644 --- a/webmapview/src/WebMaps.cpp +++ b/webmapview/src/WebMaps.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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. diff --git a/webmapview/src/main.cpp b/webmapview/src/main.cpp index 26c52949..2878005b 100644 --- a/webmapview/src/main.cpp +++ b/webmapview/src/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Research In Motion Limited. +/* Copyright (c) 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.