From cf8f369f8575dcb9ca4d5116f3afc7cff4a080af Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Wed, 15 Oct 2014 13:50:27 +0200
Subject: Move Qt Core examples under a common subdirectory

Qt Core examples were scattered into several subdirectories under
qtbase/examples. This caused an issue with the example manifest
file generated by QDoc; it expects to find all examples under a
common directory in order to produde correct paths to the example
.pro files. Qt Creator will not find the examples without a valid
manifest file.

This change moves the examples and edits the documentation files
accordingly.

Task-number: QTBUG-41963
Change-Id: I51d86782e0ba21c5c9bae5f15401ec774abe5cf8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
---
 examples/json/savegame/character.cpp | 101 -----------------------------------
 1 file changed, 101 deletions(-)
 delete mode 100644 examples/json/savegame/character.cpp

(limited to 'examples/json/savegame/character.cpp')

diff --git a/examples/json/savegame/character.cpp b/examples/json/savegame/character.cpp
deleted file mode 100644
index ef30f0eaf4..0000000000
--- a/examples/json/savegame/character.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc 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 permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "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 THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "character.h"
-
-Character::Character() :
-    mLevel(0),
-    mClassType(Warrior) {
-}
-
-Character::Character(const QString &name, int level, Character::ClassType classType) :
-    mName(name),
-    mLevel(level),
-    mClassType(classType)
-{
-}
-
-QString Character::name() const
-{
-    return mName;
-}
-
-void Character::setName(const QString &name)
-{
-    mName = name;
-}
-
-int Character::level() const
-{
-    return mLevel;
-}
-
-void Character::setLevel(int level)
-{
-    mLevel = level;
-}
-
-Character::ClassType Character::classType() const
-{
-    return mClassType;
-}
-
-void Character::setClassType(Character::ClassType classType)
-{
-    mClassType = classType;
-}
-
-//! [0]
-void Character::read(const QJsonObject &json)
-{
-    mName = json["name"].toString();
-    mLevel = json["level"].toDouble();
-    mClassType = ClassType(qRound(json["classType"].toDouble()));
-}
-//! [0]
-
-//! [1]
-void Character::write(QJsonObject &json) const
-{
-    json["name"] = mName;
-    json["level"] = mLevel;
-    json["classType"] = mClassType;
-}
-//! [1]
-- 
cgit v1.2.3