summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2012-12-12 14:15:38 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-14 11:02:47 +0100
commita0a4c06736a71fedb69f01c1c4c423173a2a665e (patch)
treef7a0144a3b2317c9483662499b3a9498f41b82cb /doc
parent4d6bf271c799e0d31b674c76fda54c493ce641a8 (diff)
downloadqtbase-a0a4c06736a71fedb69f01c1c4c423173a2a665e.tar.gz
Doc: remove example docs that were moved to qttools
Remove docs and images for Multiple Inheritance and Text Finder examples that were moved to qttools/uitools. Change-Id: I29e8f76b2512e329c354a6d3676c9b2e09e35726 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/examples/multipleinheritance.qdoc94
-rw-r--r--doc/src/snippets/code/doc_src_examples_textfinder.pro6
2 files changed, 0 insertions, 100 deletions
diff --git a/doc/src/examples/multipleinheritance.qdoc b/doc/src/examples/multipleinheritance.qdoc
deleted file mode 100644
index 541dc3c719..0000000000
--- a/doc/src/examples/multipleinheritance.qdoc
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example uitools/multipleinheritance
- \title Multiple Inheritance Example
-
- The Multiple Inheritance Example shows how to use a form created with
- Qt Designer in an application by subclassing both QWidget and the user
- interface class, which is \c{Ui::CalculatorForm}.
-
- \image multipleinheritance-example.png
-
- To subclass the \c calculatorform.ui file and ensure that \c qmake
- processes it with the \c uic, we have to include \c calculatorform.ui
- in the \c .pro file, as shown below:
-
- \snippet examples/uitools/multipleinheritance/multipleinheritance.pro 0
-
- When the project is compiled, the \c uic will generate a corresponding
- \c ui_calculatorform.h.
-
- \section1 CalculatorForm Definition
-
- In the \c CalculatorForm definition, we include the \c ui_calculatorform.h
- that was generated earlier.
-
- \snippet examples/uitools/multipleinheritance/calculatorform.h 0
-
- As mentioned earlier, the class is a subclass of both QWidget and
- \c{Ui::CalculatorForm}.
-
- \snippet examples/uitools/multipleinheritance/calculatorform.h 1
-
- Two slots are defined according to the \l{Automatic Connections}
- {automatic connection} naming convention required by \c uic. This is
- to ensure that \l{QMetaObject}'s auto-connection facilities connect
- all the signals and slots involved automatically.
-
- \section1 CalculatorForm Implementation
-
- In the constructor, we call \c setupUi() to load the user interface file.
- Note that we do not need the \c{ui} prefix as \c CalculatorForm is a
- subclass of the user interface class.
-
- \snippet examples/uitools/multipleinheritance/calculatorform.cpp 0
-
- We include two slots, \c{on_inputSpinBox1_valueChanged()} and
- \c{on_inputSpinBox2_valueChanged()}. These slots respond to the
- \l{QSpinBox::valueChanged()}{valueChanged()} signal that both spin boxes
- emit. Whenever there is a change in one spin box's value, we take that
- value and add it to whatever value the other spin box has.
-
- \snippet examples/uitools/multipleinheritance/calculatorform.cpp 1
- \codeline
- \snippet examples/uitools/multipleinheritance/calculatorform.cpp 2
-
- \section1 \c main() Function
-
- The \c main() function instantiates QApplication and \c CalculatorForm.
- The \c calculator object is displayed by invoking the \l{QWidget::show()}
- {show()} function.
-
- \snippet examples/uitools/multipleinheritance/main.cpp 0
-
- There are various approaches to include forms into applications. The
- Multiple Inheritance approach is just one of them. See
- \l{Using a Designer UI File in Your Application} for more information on
- the other approaches available.
-*/
diff --git a/doc/src/snippets/code/doc_src_examples_textfinder.pro b/doc/src/snippets/code/doc_src_examples_textfinder.pro
deleted file mode 100644
index 4446e8eb7b..0000000000
--- a/doc/src/snippets/code/doc_src_examples_textfinder.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-#! [0]
-QT += uitools
-HEADERS = textfinder.h
-RESOURCES = textfinder.qrc
-SOURCES = textfinder.cpp main.cpp
-#! [0]