summaryrefslogtreecommitdiffstats
path: root/demos/embedded
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-11 09:43:41 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-11 09:43:41 (GMT)
commit3058cd5f6ee3fb01e62d625b501e7eeeea70cd84 (patch)
tree880ceec3efd8979d5ceff6a58a1160f94e884e41 /demos/embedded
parenta958ab9c98481100870a87ee07b8e0abddbfc804 (diff)
downloadQt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.zip
Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.tar.gz
Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.tar.bz2
Eliminate some mentions of Trolltech.
Reviewed-by: Trust Me
Diffstat (limited to 'demos/embedded')
-rw-r--r--demos/embedded/fluidlauncher/pictureflow.cpp74
-rw-r--r--demos/embedded/styledemo/main.cpp4
2 files changed, 39 insertions, 39 deletions
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
index 19661d1..1c4197a 100644
--- a/demos/embedded/fluidlauncher/pictureflow.cpp
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -1,39 +1,39 @@
/****************************************************************************
**
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
-* This is version of the Pictureflow animated image show widget modified by Nokia.
-*
-* $QT_BEGIN_LICENSE:LGPL$
-* No Commercial Usage
-* This file contains pre-release code and may not be distributed.
-* You may use this file in accordance with the terms and conditions
-* contained in the either Technology Preview License Agreement or the
-* Beta Release License Agreement.
-*
-* GNU Lesser General Public License Usage
-* Alternatively, this file may be used under the terms of the GNU Lesser
-* General Public License version 2.1 as published by the Free Software
-* Foundation and appearing in the file LICENSE.LGPL included in the
-* packaging of this file. Please review the following information to
-* ensure the GNU Lesser General Public License version 2.1 requirements
-* will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-*
-* In addition, as a special exception, Nokia gives you certain
-* additional rights. These rights are described in the Nokia Qt LGPL
-* Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-* package.
-*
-* GNU General Public License Usage
-* Alternatively, this file may be used under the terms of the GNU
-* General Public License version 3.0 as published by the Free Software
-* Foundation and appearing in the file LICENSE.GPL included in the
-* packaging of this file. Please review the following information to
-* ensure the GNU General Public License version 3.0 requirements will be
-* met: http://www.gnu.org/copyleft/gpl.html.
-*
-* If you are unsure which license is appropriate for your use, please
-* contact the sales department at http://qt.nokia.com/contact.
-* $QT_END_LICENSE$
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+** This is version of the Pictureflow animated image show widget modified by Nokia.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
*
*
* Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
-* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
@@ -57,10 +57,10 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+*
****************************************************************************/
-/*
+/*
ORIGINAL COPYRIGHT HEADER
PictureFlow - animated image show widget
http://pictureflow.googlecode.com
diff --git a/demos/embedded/styledemo/main.cpp b/demos/embedded/styledemo/main.cpp
index 7aab532..7cb6b7f 100644
--- a/demos/embedded/styledemo/main.cpp
+++ b/demos/embedded/styledemo/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(styledemo);
app.setApplicationName("style");
- app.setOrganizationName("Trolltech");
- app.setOrganizationDomain("com.trolltech");
+ app.setOrganizationName("Nokia");
+ app.setOrganizationDomain("com.nokia.qt");
StyleWidget widget;
widget.showFullScreen();