Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/doc/src/frameworks-technologies/accessible.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4834    \page accessible.html
    4935    \title Accessibility
    50    
    51     \ingroup frameworks-technologies
     36    \brief How to make your applications accessible to those with disabilities.
     37
     38    \ingroup technology-apis
     39    \ingroup qt-basic-concepts
     40    \ingroup best-practices
    5241
    5342    \tableofcontents

  • trunk/doc/src/frameworks-technologies/activeqt-container.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4228/*!
    4329    \page activeqt-container.html
    44     \title Using ActiveX controls and COM objects in Qt
    45 
    46     \brief The QAxContainer module is a Windows-only extension for
    47     accessing ActiveX controls and COM objects.
     30    \title Using ActiveX controls and COM in Qt
     31    \ingroup qt-activex
     32
     33    \brief A Windows-only extension for accessing ActiveX controls and
     34    COM objects.
    4835
    4936    The QAxContainer module is part of the \l ActiveQt framework. It

  • trunk/doc/src/frameworks-technologies/activeqt-server.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4228/*!
    4329    \page activeqt-server.html
    44     \title Building ActiveX servers and controls with Qt
    45 
    46     \brief The QAxServer module is a Windows-only static library that
    47     you can use to turn a standard Qt binary into a COM server.
     30    \title Building ActiveX servers in Qt
     31    \ingroup qt-activex
     32
     33    \brief A Windows-only static library for turning a Qt binary into a COM server.
    4834
    4935    The QAxServer module is part of the \l ActiveQt framework. It
    … …  
    9985    \o Register the server
    10086    \endlist
    101 
    102     Note that the QAxServer build system is not supported on Windows 98/ME
    103     (attaching of resources to a binary is not possible there), but a server
    104     built on Windows NT/2000/XP will work on previous Windows versions as well.
    10587
    10688    To skip the post-processing step, also set the \c qaxserver_no_postlink
    … …  
    414396    OLE needs to marshal user defined types by reference (ByRef), and cannot
    415397    marshal them by value (ByVal). This is why const-references and object
    416     parameters are not supported for QRect, QSize and QPoint. Also note that
    417     servers with this datatype require Windows 98 or DCOM 1.2 to be installed.
     398    parameters are not supported for QRect, QSize and QPoint.
    418399    \endfootnote
    419400    \o [in, out] struct QRect (user defined)

  • trunk/doc/src/frameworks-technologies/activeqt.qdoc

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    5440/*!
    5541    \page activeqt.html
    56     \title ActiveQt Framework
     42    \title Qt's ActiveX Framework (ActiveQt)
    5743    \brief An overview of Qt's ActiveX and COM integration on Windows.
    5844
    59     \ingroup platform-specific
    60     \ingroup frameworks-technologies
     45    \ingroup qt-activex
    6146    \keyword ActiveQt
     47    \target ActiveQt Framework
    6248
    6349    Qt's ActiveX and COM support allows Qt for Windows developers to:
    … …  
    7258
    7359    For more information about using ActiveX with Qt, see
    74     \l{Building ActiveX servers and controls with Qt}.
     60    \l{Building ActiveX servers in Qt}.
    7561
    7662    The ActiveQt framework consists of two modules:
    7763
    7864    \list
    79     \o The \l{Using ActiveX controls and COM objects in Qt}{QAxContainer}
     65    \o The \l{Using ActiveX controls and COM in Qt}{QAxContainer}
    8066       module is a static library implementing QObject and QWidget subclasses,
    8167       QAxObject and QAxWidget, that act as containers for COM objects and
    8268       ActiveX controls.
    83     \o The \l{Building ActiveX servers and controls with Qt}{QAxServer}
     69    \o The \l{Building ActiveX servers in Qt}{QAxServer}
    8470       module is a static library that implements
    8571       functionality for in-process and executable COM servers. This
    … …  
    10288    Designer}.
    10389
    104     The ActiveQt modules are part of the \l{Qt Full Framework Edition} and
     90    The ActiveQt modules are part of the \l{Qt Commercial Edition} and
    10591    the \l{Open Source Versions of Qt}.
    10692

  • trunk/doc/src/frameworks-technologies/animation.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4834    \page animation-overview.html
    4935    \title The Animation Framework
     36    \ingroup qt-gui-concepts
    5037
    5138    \brief An overview of the Animation Framework

  • trunk/doc/src/frameworks-technologies/containers.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    5844/*!
    5945    \page containers.html
    60     \title Generic Containers
    61     \ingroup frameworks-technologies
     46    \title Container Classes
     47    \ingroup technology-apis
    6248    \ingroup groups
     49    \ingroup qt-basic-concepts
    6350    \keyword container class
    6451    \keyword container classes
    … …  
    613600    Qt automatically takes a copy of the container when it enters a
    614601    \c foreach loop. If you modify the container as you are
    615     iterating, that won't affect the loop. (If you don't modify the
     602    iterating, that won't affect the loop. (If you do not modify the
    616603    container, the copy still takes place, but thanks to \l{implicit
    617     sharing} copying a container is very fast.) Similarly, declaring
    618     the variable to be a non-const reference, in order to modify the
    619     current item in the list will not work either.
     604    sharing} copying a container is very fast.)
     605
     606    Since foreach creates a copy of the container, using a non-const
     607    reference for the variable does not allow you to modify the original
     608    container. It only affects the copy, which is probably not what you
     609    want.
    620610
    621611    In addition to \c foreach, Qt also provides a \c forever

  • trunk/doc/src/frameworks-technologies/dbus-adaptors.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4329    \page usingadaptors.html
    4430    \title Using QtDBus Adaptors
     31    \brief How to create and use DBus adaptors in Qt.
    4532
    4633    \ingroup best-practices

  • trunk/doc/src/frameworks-technologies/dbus-intro.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4228/*!
    4329    \page intro-to-dbus.html
    44     \title Introduction to D-Bus
     30    \title D-Bus
    4531    \brief An introduction to Inter-Process Communication and Remote Procedure Calling with D-Bus.
    4632
    4733    \keyword QtDBus
    48     \ingroup frameworks-technologies
     34    \ingroup technology-apis
    4935
    5036    \section1 Introduction

  • trunk/doc/src/frameworks-technologies/desktop-integration.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4127
    4228/*!
    43     \group desktop
    44     \title Desktop Integration Classes
    45 */
    46 
    47 /*!
    4829    \page desktop-integration.html
    4930    \title Desktop Integration
    … …  
    5132   
    5233    \ingroup best-practices
     34    \ingroup qt-gui-concepts
    5335
    5436    Qt applications behave well in the user's desktop environment, but certain

  • trunk/doc/src/frameworks-technologies/dnd.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    3925**
    4026****************************************************************************/
    41 
    42 /*!
    43     \group draganddrop
    44     \title Drag And Drop Classes
    45 
    46     \brief Classes dealing with drag and drop and mime type encoding and decoding.
    47 */
    4827
    4928/*!
    … …  
    5231    \brief An overview of the drag and drop system provided by Qt.
    5332
    54     \ingroup frameworks-technologies
     33    \ingroup qt-gui-concepts
    5534
    5635    Drag and drop provides a simple visual mechanism which users can use
    … …  
    6544    outlines the approach used to enable it in custom widgets. Drag
    6645    and drop operations are also supported by Qt's item views and by
    67     the graphics view framework; more information is available in the
    68     \l{Using Drag and Drop with Item Views} and \l{The Graphics View
    69     Framework} documents.
     46    the graphics view framework. More information is available in
     47    \l{Using drag and drop with item views} and \l{Graphics View
     48    Framework}.
    7049
    7150    \section1 Drag and Drop Classes

  • trunk/doc/src/frameworks-technologies/eventsandfilters.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    5541/*!
    5642    \page eventsandfilters.html
    57     \title Events and Event Filters
     43    \title The Event System
     44    \ingroup qt-basic-concepts
    5845    \brief A guide to event handling in Qt.
    5946
    … …  
    6855    application.
    6956
    70     \tableofcontents
    71 
    7257    \section1 How Events are Delivered
    7358
    … …  
    116101    QCoreApplication::notify() concisely tells the whole story; the
    117102    \e{Qt Quarterly} article
    118     \l{http://qt.nokia.com/doc/qq/qq11-events.html}{Another Look at Events}
     103    \l{http://doc.qt.nokia.com/qq/qq11-events.html}{Another Look at Events}
    119104    rehashes it less concisely. Here we will explain enough for 95%
    120105    of applications.

  • trunk/doc/src/frameworks-technologies/gestures.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4329    \page gestures-overview.html
    4430    \title Gestures Programming
    45     \ingroup frameworks-technologies
    4631    \startpage index.html Qt Reference Documentation
    47 
    48     \brief An overview of the Qt support for Gesture programming.
    49 
    50     Qt includes a framework for gesture programming that gives has the ability
     32    \ingroup technology-apis
     33    \ingroup qt-gui-concepts
     34
     35    \brief An overview of Qt support for Gesture programming.
     36
     37    Qt includes a framework for gesture programming that has the ability
    5138    to form gestures from a series of events, independently of the input methods
    5239    used. A gesture could be a particular movement of a mouse, a touch screen
    … …  
    7461
    7562    Gestures can be enabled for instances of QWidget and QGraphicsObject subclasses.
    76     An object that accepts gesture input is referred to as a \e{target object}.
     63    An object that accepts gesture input is referred to throughout the documentation
     64    as a \e{target object}.
    7765
    7866    To enable a gesture for a target object, call its QWidget::grabGesture() or
    … …  
    8371    \snippet examples/gestures/imagegestures/imagewidget.cpp enable gestures
    8472
    85     In the above code, the gesture is set up in the constructor of the target object
     73    In the above code, the gestures are set up in the constructor of the target object
    8674    itself.
     75
     76    \section1 Handling Events
    8777
    8878    When the user performs a gesture, QGestureEvent events will be delivered to the
    8979    target object, and these can be handled by reimplementing the QWidget::event()
    9080    handler function for widgets or QGraphicsItem::sceneEvent() for graphics objects.
     81
     82    As one target object can subscribe to more than one gesture type, the QGestureEvent
     83    can contain more than one QGesture, indicating several possible gestures are active
     84    at the same time. It is then up to the widget to determine how to handle those
     85    multiple gestures and choose if some should be canceled in favor of others.
     86
     87    Each QGesture contained within a QGestureEvent object can be accepted() or ignored()
     88    individually, or all together. Additionally, you can query the individual QGesture
     89    data objects (the state) using several getters.
     90
     91    \section2 Standard Procedure for Event Handling
     92
     93    A QGesture is by default accepted when it arrives at your widget. However, it is good
     94    practice to always explicitly accept or reject a gesture. The general rule is that, if
     95    you accept a gesture, you are using it. If you are ignoring it you are not interested
     96    in it. Ignoring a gesture may mean it gets offered to another target object, or it will
     97    get canceled.
     98
     99    Each QGesture has several states it goes through; there is a well defined way to change
     100    the state, typically the user input is the cause of state changes (by starting and
     101    stopping interaction, for instance) but the widget can also cause state changes.
     102
     103    The first time a particular QGesture is delivered to a widget or graphics item, it will
     104    be in the Qt::GestureStarted state. The way you handle the gesture at this point
     105    influences whether you can interact with it later.
     106
     107    \list
     108    \o Accepting the gesture means the widget acts on the gesture and there will follow
     109       gestures with the Qt::GestureUpdatedstate.
     110    \o Ignoring the gesture will mean the gesture will never be offered to you again.
     111       It will be offered to a parent widget or item as well.
     112    \o Calling setGestureCancelPolicy() on the gesture when it is in its starting state,
     113       and is also accepted can cause other gestures to be canceled.
     114    \endlist
     115
     116    Using QGesture::CancelAllInContext to cancel a gesture will cause all gestures, in any
     117    state, to be canceled unless they are explicitly accepted. This means that active
     118    gestures on children will get canceled. It also means that gestures delivered in the
     119    same QGestureEvent will get canceled if the widget ignores them. This can be a useful
     120    way to filter out all gestures except the one you are interested in.
     121
     122    \section2 Example Event Handling
    91123
    92124    For convenience, the \l{Image Gestures Example} reimplements the general

  • trunk/doc/src/frameworks-technologies/graphicsview.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4733/*!
    4834    \page graphicsview.html
    49     \title The Graphics View Framework
     35    \title Graphics View Framework
     36    \ingroup qt-graphics
     37    \ingroup qt-basic-concepts
     38       
    5039    \brief An overview of the Graphics View framework for interactive 2D
    5140    graphics.
    52 
    53     \ingroup frameworks-technologies
    5441
    5542    \keyword Graphics View
    … …  
    222209
    223210      When rendering, Graphics View's scene coordinates correspond to
    224       QPainter's \e logical coordinates, and view coordinates are the same as
    225       \e device coordinates.  In \l{The Coordinate System}, you can read about
    226       the relationship between logical coordinates and device coordinates.
     211      QPainter's \e logical coordinates, and view coordinates are the
     212      same as \e device coordinates.  In the \l{Coordinate System}
     213      documentation, you can read about the relationship between
     214      logical coordinates and device coordinates.
    227215
    228216      \img graphicsview-parentchild.png
    … …  
    437425      \section2 Animation
    438426
    439         Graphics View supports animation at several levels. You can easily
    440         assemble animation by using the Animation Framework. For that you'll
    441                 need your items to inherit from QGraphicsObject and associate
    442                 QPropertyAnimation with them. QPropertyAnimation allows to animate any
    443                 QObject property.
     427        Graphics View supports animation at several levels. You can
     428        easily assemble animation by using the Animation Framework.
     429        For that you'll need your items to inherit from
     430        QGraphicsObject and associate QPropertyAnimation with
     431        them. QPropertyAnimation allows to animate any QObject
     432        property.
    444433
    445434        Another option is to create a custom item that inherits from QObject

  • trunk/doc/src/frameworks-technologies/implicit-sharing.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    5137    \page implicit-sharing.html
    5238    \title Implicit Sharing
    53     \ingroup frameworks-technologies
     39    \ingroup qt-basic-concepts
    5440
    5541    \brief Reference counting for fast copying.

  • trunk/doc/src/frameworks-technologies/ipc.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4531    \brief Inter-Process communication in Qt applications.
    4632
    47     \ingroup frameworks-technologies
     33    \ingroup technology-apis
     34    \ingroup qt-basic-concepts
     35    \ingroup qt-network
    4836
    4937    Qt provides several ways to implement Inter-Process Communication
    … …  
    7058    \section1 D-Bus
    7159
    72     The \l{QtDBus} module is a Unix-only library
    73     you can use to implement IPC using the D-Bus protocol. It extends
    74     Qt's \l{signalsandslots.html} {Signals and Slots} mechanism to the
    75     IPC level, allowing a signal emitted by one process to be
    76     connected to a slot in another process. This \l {Introduction to
    77     D-Bus} page has detailed information on how to use the \l{QtDBus}
    78     module.
     60    The \l{QtDBus} module is a Unix-only library you can use to
     61    implement IPC using the D-Bus protocol. It extends Qt's
     62    \l{signalsandslots.html} {Signals and Slots} mechanism to the IPC
     63    level, allowing a signal emitted by one process to be connected to
     64    a slot in another process. This \l {D-Bus} page has detailed
     65    information on how to use the \l{QtDBus} module.
    7966
    8067    \section1 Qt COmmunications Protocol (QCOP)

  • trunk/doc/src/frameworks-technologies/model-view-programming.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4733/*!
    4834    \page model-view-programming.html
    49     \nextpage An Introduction to Model/View Programming
    50     \startpage index.html Qt Reference Documentation
     35        \ingroup qt-basic-concepts
    5136
    5237    \title Model/View Programming
    53     \brief A guide to the extensible model/view architecture used by Qt's
    54     item view classes.
    55 
    56     \ingroup frameworks-technologies
    57 
    58     \list
    59     \o \l{An Introduction to Model/View Programming}
    60       \tableofcontents{1 An Introduction to Model/View Programming}
    61     \o \l{Using Models and Views}
    62       \tableofcontents{1 Using Models and Views}
    63     \o \l{Model Classes}
    64       \tableofcontents{1 Model Classes}
    65     \o \l{Creating New Models}
    66       \tableofcontents{1 Creating New Models}
    67     \o \l{View Classes}
    68       \tableofcontents{1 View Classes}
    69     \o \l{Handling Selections in Item Views}
    70       \tableofcontents{1 Handling Selections in Item Views}
    71     \o \l{Delegate Classes}
    72       \tableofcontents{1 Delegate Classes}
    73     \o \l{Item View Convenience Classes}
    74       \tableofcontents{1 Item View Convenience Classes}
    75     \o \l{Using Drag and Drop with Item Views}
    76       \tableofcontents{1 Using Drag and Drop with Item Views}
    77     \o \l{Proxy Models}
    78       \tableofcontents{1 Proxy Models}
    79     \o \l{Model Subclassing Reference}
    80       \tableofcontents{1 Model Subclassing Reference}
    81     \endlist
    82 
    83     \keyword Model/View Classes
    84     \section1 All Model/View Classes
    85 
    86     These classes use the model/view design pattern in which the
    87     underlying data (in the model) is kept separate from the way the data
    88     is presented and manipulated by the user (in the view).
    89 
    90     \annotatedlist model-view
    91 
    92     \section1 Related Examples
    93 
    94     \list
    95     \o \l{itemviews/dirview}{Dir View}
    96     \o \l{itemviews/spinboxdelegate}{Spin Box Delegate}
    97     \o \l{itemviews/pixelator}{Pixelator}
    98     \o \l{itemviews/simpletreemodel}{Simple Tree Model}
    99     \o \l{itemviews/chart}{Chart}
    100     \endlist
    101 */
    102 
    103 /*!
    104     \page model-view-introduction.html
    105     \previouspage Model/View Programming
    106     \nextpage Using Models and Views
    107     \startpage index.html Qt Reference Documentation
    108 
    109     \title An Introduction to Model/View Programming
    110 
    111     \tableofcontents
    112 
    113     Qt 4 introduces a new set of item view classes that use a model/view
     38    \brief A guide to Qt's extensible model/view architecture.
     39
     40    \section1 Introduction to Model/View Programming
     41
     42    Qt 4 introduced a new set of item view classes that use a model/view
    11443    architecture to manage the relationship between data and the way it
    11544    is presented to the user. The separation of functionality introduced by
    … …  
    12251    and examples are given that show how to use the classes provided.
    12352
    124     \section1 The Model/View Architecture
     53    \section2 The model/view architecture
    12554
    12655    Model-View-Controller (MVC) is a design pattern originating from
    … …  
    186115    \endlist
    187116
    188     \section2 Models
     117    \section3 Models
    189118
    190119    All item models are based on the QAbstractItemModel class. This class
    … …  
    226155    your own custom models.
    227156
    228     \section2 Views
     157    \section3 Views
    229158
    230159    Complete implementations are provided for different kinds of
    … …  
    238167    The available views are examined in the section on \l{View Classes}.
    239168
    240     \section2 Delegates
     169    \section3 Delegates
    241170
    242171    QAbstractItemDelegate is the abstract base class for delegates in the
    … …  
    252181    Delegates are described in the section on \l{Delegate Classes}.
    253182
    254     \section2 Sorting
     183    \section3 Sorting
    255184
    256185    There are two ways of approaching sorting in the model/view
    … …  
    273202    in the section on \l {Proxy Models}.
    274203
    275     \section2 Convenience Classes
     204    \section3 Convenience classes
    276205
    277206    A number of \e convenience classes are derived from the standard view
    … …  
    294223    QStandardItemModel.
    295224
    296     \section1 The Model/View Components
    297 
    298     The following sections describe the way in which the model/view pattern
    299     is used in Qt. Each section provides an example of use, and is followed
    300     by a section showing how you can create new components.
    301 */
    302 
    303 /*!
    304     \page model-view-using.html
    305     \contentspage model-view-programming.html Contents
    306     \previouspage An Introduction to Model/View Programming
    307     \nextpage Model Classes
    308 
    309     \title Using Models and Views
    310 
    311     \tableofcontents
    312 
    313     \section1 Introduction
     225    \section1 Using models and views
     226
     227    The following sections explain how to use the model/view pattern
     228    in Qt. Each section includes an an example and is followed by a
     229    section showing how to create new components.
     230
     231    \section2 Two models included in Qt
    314232
    315233    Two of the standard models provided by Qt are QStandardItemModel and
    … …  
    326244    manipulate data using model indexes.
    327245
    328     \section1 Using Views with an Existing Model
     246    \section2 Using views with an existing model
    329247
    330248    The QListView and QTreeView classes are the most suitable views
    … …  
    362280    The \c index() function used in this case is unique to QFileSystemModel; we
    363281    supply it with a directory and it returns a model index. Model indexes are
    364     discussed in the \l{Model Classes} chapter.
     282    discussed in \l{Model Classes}.
    365283
    366284    The rest of the function just displays the views within a splitter
    … …  
    370288
    371289    In the above example, we neglected to mention how to handle selections
    372     of items. This subject is covered in more detail in the chapter on
    373     \l{Handling Selections in Item Views}. Before examining how selections
    374     are handled, you may find it useful to read the \l{Model Classes} chapter
    375     which describes the concepts used in the model/view framework.
    376 */
    377 
    378 /*!
    379     \page model-view-model.html
    380     \contentspage model-view-programming.html Contents
    381     \previouspage Using Models and Views
    382     \nextpage Creating New Models
    383 
    384     \title Model Classes
    385 
    386     \tableofcontents
    387 
    388     \section1 Basic Concepts
     290    of items. This subject is covered in more detail in the section about
     291    \l{Handling Selections in Item Views}.
     292
     293    \section1 Model classes
     294
     295    Before examining how selections are handled, you may find it
     296    useful to examine the concepts used in the model/view framework.
     297
     298    \section2 Basic concepts
    389299
    390300    In the model/view architecture, the model provides a standard interface
    … …  
    402312    signals and slots mechanism.
    403313
    404     This chapter describes some basic concepts that are central to the way
     314    This section describes some basic concepts that are central to the way
    405315    item of data are accessed by other components via a model class. More
    406     advanced concepts are discussed in later chapters.
    407 
    408     \section2 Model Indexes
     316    advanced concepts are discussed in later sections.
     317
     318    \section3 Model indexes
    409319
    410320    To ensure that the representation of the data is kept separate from the
    … …  
    436346    and explain these properties in detail.
    437347
    438     \section2 Rows and Columns
     348    \section3 Rows and columns
    439349
    440350    In its most basic form, a model can be accessed as a simple table in which
    … …  
    469379    \endtable
    470380
    471     \section2 Parents of Items
     381    \section3 Parents of items
    472382
    473383    The table-like interface to item data provided by models is ideal when
    … …  
    502412    \endtable
    503413
    504     \section2 Item Roles
     414    \section3 Item roles
    505415
    506416    Items in a model can perform various \e roles for other components,
    … …  
    535445    define additional roles for application-specific purposes.
    536446
    537     \section2 Summary of Concepts
     447    \section3 Summary
    538448
    539449    \list
    … …  
    547457    \o If a valid model index is specified for the parent item when an index is
    548458       requested using \l{QAbstractItemModel::index()}{index()}, the index
    549        returned will refer to an item beneath that parent item in the
    550        model.
     459       returned refers to an item beneath that parent item in the model.
    551460       The index obtained refers to a child of that item.
    552461    \o If an invalid model index is specified for the parent item when an index
    553462       is requested using \l{QAbstractItemModel::index()}{index()}, the index
    554        returned will refer to a top-level item in the model.
     463       returned refers to a top-level item in the model.
    555464    \o The \l{Qt::ItemDataRole}{role} distinguishes between the
    556465       different kinds of data associated with an item.
    557466    \endlist
    558467
    559     \section2 Using Model Indexes
     468    \section2 Using model indexes
    560469
    561470    To demonstrate how data can be retrieved from a model, using model
    … …  
    611520    \endlist
    612521
    613 
    614     \section1 Further Reading
    615 
    616     New models can be created by implementing the standard interface provided
    617     by QAbstractItemModel. In the \l{Creating New Models} chapter, we will
    618     demonstrate this by creating a convenient ready-to-use model for holding
    619     lists of strings.
    620 */
    621 
    622 /*!
    623     \page model-view-view.html
    624     \contentspage model-view-programming.html Contents
    625     \previouspage Creating New Models
    626     \nextpage Handling Selections in Item Views
    627 
    628     \title View Classes
    629 
    630     \tableofcontents
    631 
    632     \section1 Concepts
     522    \section2 Further reading
     523
     524    New models can be created by implementing the standard interface
     525    provided by QAbstractItemModel. In the \l{Creating New Models}
     526    section, we demonstrate this by creating a convenient ready-to-use
     527    model for holding lists of strings.
     528
     529    \section1 View classes
     530
     531    \section2 Concepts
    633532
    634533    In the model/view architecture, the view obtains items of data from the
    … …  
    669568    labels for views.
    670569
    671     \section1 Using an Existing View
     570    \section2 Using an existing view
    672571
    673572    Qt provides three ready-to-use view classes that present data from
    … …  
    687586    user interfaces.
    688587
    689     \section2 Using a Model
     588    \section3 Using a model
    690589
    691590    We take the string list model that \l{Creating New Models}{we created as
    … …  
    698597    Note that the \c StringListModel is declared as a \l QAbstractItemModel.
    699598    This allows us to use the abstract interface to the model, and
    700     ensures that the code will still work even if we replace the string list
    701     model with a different model in the future.
     599    ensures that the code still works, even if we replace the string list
     600    model with a different model.
    702601
    703602    The list view provided by \l QListView is sufficient for presenting
    … …  
    722621    each item in the list to be edited using the default delegate.
    723622
    724     \section2 Using Multiple Views onto the Same Model
     623    \section3 Using multiple views of a model
    725624
    726625    Providing multiple views onto the same model is simply a matter of
    … …  
    746645    many applications, a shared selection model is desirable.
    747646
    748     \section1 Handling Selections of Items
     647    \section2 Handling selections of items
    749648
    750649    The mechanism for handling selections of items within views is provided
    … …  
    759658    data.
    760659
    761     Generally, unless you are subclassing a model or view, you will not
    762     need to manipulate the contents of selections directly. However, the
    763     interface to the selection model can be accessed, if required, and
    764     this is explored in the chapter on
    765     \l{Handling Selections in Item Views}.
    766 
    767     \section2 Sharing Selections Between Views
     660    Generally, unless you are subclassing a model or view, you don't
     661    need to manipulate the contents of selections directly. However,
     662    the interface to the selection model can be accessed, if required,
     663    and this is explored in \l{Handling Selections in Item Views}.
     664
     665    \section3 Sharing selections among views
    768666
    769667    Although it is convenient that the view classes provide their own
    … …  
    789687    represented as a fragmented set of highlighted items in a tree view.
    790688
    791 */
    792 
    793 /*!
    794     \page model-view-delegate.html
    795     \contentspage model-view-programming.html Contents
    796     \previouspage Handling Selections in Item Views
    797     \nextpage Item View Convenience Classes
    798 
    799     \title Delegate Classes
    800 
    801     \tableofcontents
    802 
    803     \section1 Concepts
     689    \section1 Delegate classes
     690
     691    \section2 Concepts
    804692
    805693    Unlike the Model-View-Controller pattern, the model/view design does not
    … …  
    822710    Editors for delegates can be implemented either by using widgets to manage
    823711    the editing process or by handling events directly.
    824     The first approach is covered later in this chapter, and it is also
     712    The first approach is covered later in this section, and it is also
    825713    shown in the \l{Spin Box Delegate Example}{Spin Box Delegate} example.
    826714
    … …  
    828716    custom delegate that performs specialized rendering for a table view.
    829717
    830     \section1 Using an Existing Delegate
     718    \section2 Using an existing delegate
    831719
    832720    The standard views provided with Qt use instances of \l QItemDelegate
    … …  
    846734    view.
    847735
    848     \section1 A Simple Delegate
    849 
    850     The delegate implemented here uses a \l QSpinBox to provide editing
    851     facilities, and is mainly intended for use with models that display
    852     integers. Although we set up a custom integer-based table model for
    853     this purpose, we could easily have used \l QStandardItemModel instead
    854     since the custom delegate will control data entry. We construct a
    855     table view to display the contents of the model, and this will use
    856     the custom delegate for editing.
     736    \section2 A simple delegate
     737
     738    The delegate implemented here uses a \l QSpinBox to provide
     739    editing facilities, and is mainly intended for use with models
     740    that display integers. Although we set up a custom integer-based
     741    table model for this purpose, we could easily have used \l
     742    QStandardItemModel instead, since the custom delegate controls
     743    data entry. We construct a table view to display the contents of
     744    the model, and this will use the custom delegate for editing.
    857745
    858746    \img spinboxdelegate-example.png
    … …  
    867755    constructed. We only construct an editor widget when it is needed.
    868756
    869     \section2 Providing an Editor
     757    \section3 Providing an editor
    870758
    871759    In this example, when the table view needs to provide an editor, it
    … …  
    907795    appropriate type before accessing its member functions.
    908796
    909     \section2 Submitting Data to the Model
     797    \section3 Submitting data to the model
    910798
    911799    When the user has finished editing the value in the spin box, the view
    … …  
    936824    provides sensible default values for unexpected data.
    937825
    938     \section2 Updating the Editor's Geometry
     826    \section3 Updating the editor's geometry
    939827
    940828    It is the responsibility of the delegate to manage the editor's
    … …  
    952840
    953841    \target EditingHints
    954     \section2 Editing Hints
     842    \section3 Editing hints
    955843
    956844    After editing, delegates should provide hints to the other components
    … …  
    983871    be less integrated into applications, and will be less usable than
    984872    those that emit hints to support common editing actions.
    985 */
    986 
    987 /*!
    988     \page model-view-selection.html
    989     \contentspage model-view-programming.html Contents
    990     \previouspage View Classes
    991     \nextpage Delegate Classes
    992 
    993     \title Handling Selections in Item Views
    994 
    995     \tableofcontents
    996 
    997     \section1 Concepts
     873
     874    \section1 Handling selections in item views
     875
     876    \section2 Concepts
    998877
    999878    The selection model used in the item view classes offers many improvements
    … …  
    1023902    commands. These are discussed later in this section.
    1024903
    1025 
    1026     \section2 Current Item and Selected Items
     904    \section3 Current item and selected items
    1027905
    1028906    In a view, there is always a current item and a selected item - two
    … …  
    1069947    mechanism.
    1070948
    1071 
    1072     \section1 Using a Selection Model
     949    \section2 Using a selection model
    1073950
    1074951    The standard view classes provide default selection models that can
    … …  
    1089966    selection model.
    1090967
    1091 
    1092     \section2 Selecting Items
     968    \section3 Selecting items
    1093969
    1094970    To demonstrate some of the principal features of selections, we construct
    … …  
    1123999    The selection of items can be modified using various operations that
    11241000    are defined by the selection flags. The selection that results from
    1125     these operations may have a complex structure, but will be represented
     1001    these operations may have a complex structure, but it is represented
    11261002    efficiently by the selection model. The use of different selection
    11271003    flags to manipulate the selected items is described when we examine
    11281004    how to update a selection.
    11291005
    1130     \section2 Reading the Selection State
     1006    \section3 Reading the selection state
    11311007
    11321008    The model indexes stored in the selection model can be read using
    … …  
    11371013    \snippet doc/src/snippets/reading-selections/window.cpp 0
    11381014
    1139     The above code uses Qt's convenient \l{Generic Containers}{foreach
     1015    The above code uses Qt's convenient \l{Container Classes}{foreach
    11401016    keyword} to iterate over, and modify, the items corresponding to the
    11411017    indexes returned by the selection model.
    … …  
    11771053    signals, but we can also update the selection model directly.
    11781054
    1179     \section2 Updating a Selection
     1055    \section3 Updating a selection
    11801056
    11811057    Selection commands are provided by a combination of selection flags,
    … …  
    12161092    \l{QItemSelectionModel::SelectionFlag}{Select} and
    12171093    \l{QItemSelectionModel::SelectionFlag}{Rows}, the
    1218     entire row containing the item referred to will be selected.
     1094    entire row containing the item referred to is selected.
    12191095    The following code demonstrates the use of the
    12201096    \l{QItemSelectionModel::SelectionFlag}{Rows} and
    … …  
    12491125    indexes.
    12501126
    1251     \section2 Selecting All Items in a Model
     1127    \section3 Selecting all items in a model
    12521128
    12531129    To select all items in a model, it is necessary to create a
    … …  
    12721148    determine whether any given item is the parent of another level of
    12731149    items.
    1274 */
    1275 
    1276 /*!
    1277     \page model-view-creating-models.html
    1278     \contentspage model-view-programming.html Contents
    1279     \previouspage Model Classes
    1280     \nextpage View Classes
    1281 
    1282     \title Creating New Models
    1283 
    1284     \tableofcontents
    1285 
    1286     \section1 Introduction
     1150
     1151    \section1 Creating new models
    12871152
    12881153    The separation of functionality between the model/view components allows
    … …  
    13021167    easier to use as a starting point for simple list and table models.
    13031168
    1304     In this chapter, we create a simple read-only model to explore
     1169    In this section, we create a simple read-only model to explore
    13051170    the basic principles of the model/view architecture. Later in this
    1306     chapter, we will adapt this simple model so that items can be modified
     1171    section, we adapt this simple model so that items can be modified
    13071172    by the user.
    13081173
    … …  
    13131178    detail in the \l{Model Subclassing Reference} document.
    13141179
    1315     \section1 Designing a Model
    1316 
    1317     When creating a new model for an existing data structure, it is important
    1318     to consider which type of model should be used to provide an interface
    1319     onto the data. If the data structure can be represented as a
    1320     list or table of items, you can subclass QAbstractListModel or
    1321     QAbstractTableModel since these classes provide suitable default
    1322     implementations for many functions.
    1323 
    1324     However, if the underlying data structure can only be represented by a
    1325     hierarchical tree structure, it is necessary to subclass
     1180    \section2 Designing a model
     1181
     1182    When creating a new model for an existing data structure, it is
     1183    important to consider which type of model should be used to
     1184    provide an interface onto the data. If the data structure can be
     1185    represented as a list or table of items, you can subclass
     1186    QAbstractListModel or QAbstractTableModel since these classes
     1187    provide suitable default implementations for many functions.
     1188
     1189    However, if the underlying data structure can only be represented
     1190    by a hierarchical tree structure, it is necessary to subclass
    13261191    QAbstractItemModel. This approach is taken in the
    13271192    \l{itemviews/simpletreemodel}{Simple Tree Model} example.
    13281193
    1329     In this chapter, we will implement a simple model based on a list of
     1194    In this section, we implement a simple model based on a list of
    13301195    strings, so the QAbstractListModel provides an ideal base class on
    13311196    which to build.
    … …  
    13391204    provides a custom constructor for just this purpose.
    13401205
    1341     \section1 A Read-Only Example Model
     1206    \section2 A read-only example model
    13421207
    13431208    The model implemented here is a simple, non-hierarchical, read-only data
    … …  
    13561221    interface. The class declaration is as follows:
    13571222
    1358 
    13591223    \snippet doc/src/snippets/stringlistmodel/model.h 0
    13601224    \snippet doc/src/snippets/stringlistmodel/model.h 1
    … …  
    13801244    member variable.
    13811245
    1382     \section2 Dimensions of The Model
     1246    \section3 Dimensions of the model
    13831247
    13841248    We want the number of rows in the model to be the same as the number of
    … …  
    13951259    function.
    13961260
    1397     \section2 Model Headers and Data
     1261    \section3 Model headers and data
    13981262
    13991263    For items in the view, we want to return the strings in the string list.
    … …  
    14341298    display information about items in a tooltip.
    14351299
    1436     \section1 An Editable Model
     1300    \section2 An editable model
    14371301
    14381302    The read-only model shows how simple choices could be presented to the
    … …  
    14481312    \snippet doc/src/snippets/stringlistmodel/model.h 3
    14491313
    1450     \section2 Making the Model Editable
     1314    \section3 Making the model editable
    14511315
    14521316    A delegate checks whether an item is editable before creating an
    … …  
    14741338    standard item delegate. For boolean values, however, you can use
    14751339    Qt::CheckStateRole and set the Qt::ItemIsUserCheckable flag; a
    1476     checkbox will then be used for editing the value. The underlying
     1340    checkbox is then used for editing the value. The underlying
    14771341    data in this model is the same for all roles, so this detail just
    14781342    makes it easier to integrate the model with standard components.
    … …  
    14881352    \snippet doc/src/snippets/stringlistmodel/model.cpp 1
    14891353
    1490     \section2 Inserting and Removing Rows
     1354    \section3 Inserting and removing rows
    14911355
    14921356    It is possible to change the number of rows and columns in a model. In the
    … …  
    15371401    have changed.
    15381402
    1539     \section1 Next Steps
     1403    \section2 Next steps
    15401404
    15411405    We can display the data provided by this model, or any other model, using
    … …  
    15441408    For the string list model, this view also provides a default editor so that
    15451409    the items can be manipulated. We examine the possibilities made available by
    1546     the standard view classes in the chapter on \l{View Classes}.
     1410    the standard view classes in \l{View Classes}.
    15471411
    15481412    The \l{Model Subclassing Reference} document discusses the requirements of
    … …  
    15501414    virtual functions that must be implemented to enable various features in
    15511415    different types of models.
    1552 */
    1553 
    1554 /*!
    1555     \page model-view-convenience.html
    1556     \contentspage model-view-programming.html Contents
    1557     \previouspage Delegate Classes
    1558     \nextpage Using Drag and Drop with Item Views
    1559 
    1560     \title Item View Convenience Classes
    1561 
    1562     \tableofcontents
    1563 
    1564     \section1 Overview
    1565 
    1566     Alongside the model/view classes, Qt 4 also includes standard widgets to
    1567     provide classic item-based container widgets. These behave in a similar
    1568     way to the item view classes in Qt 3, but have been rewritten to use the
    1569     underlying model/view framework for performance and maintainability. The
    1570     old item view classes are still available in the compatibility library
    1571     (see the \l{porting4.html}{Porting Guide} for more information).
     1416
     1417    \section1 Item view convenience classes
     1418
     1419    Qt 4 also introduced some standard widgets to provide classic
     1420    item-based container widgets. These behave in a similar way to the
     1421    item view classes in Qt 3, but have been rewritten to use the
     1422    underlying model/view framework for performance and
     1423    maintainability. The old item view classes are still available in
     1424    the compatibility library (see the \l{porting4.html}{Porting
     1425    Guide} for more information).
    15721426
    15731427    The item-based widgets have been given names which reflect their uses:
    … …  
    15781432    management.
    15791433
    1580     \section1 List Widgets
     1434    \section2 List widgets
    15811435
    15821436    Single level lists of items are typically displayed using a \c QListWidget
    … …  
    16131467    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 5
    16141468
    1615 
    1616     \section1 Tree Widgets
     1469    \section2 Tree widgets
    16171470
    16181471    Trees or hierarchical lists of items are provided by the \c QTreeWidget
    … …  
    16691522    \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 9
    16701523
    1671 
    1672     \section1 Table Widgets
     1524    \section2 Table widgets
    16731525
    16741526    Tables of items similar to those found in spreadsheet applications
    … …  
    16941546    Note that the rows and columns in the table begin at zero.
    16951547
    1696     \section1 Common Features
     1548    \section2 Common features
    16971549
    16981550    There are a number of item-based features common to each of the
    … …  
    17031555    for more details about the use of each function used.
    17041556
    1705     \section2 Hidden Items
     1557    \section3 Hidden items
    17061558
    17071559    It is sometimes useful to be able to hide items in an item view widget
    … …  
    17141566    all three convenience classes.
    17151567
    1716     \section2 Selections
     1568    \section3 Selections
    17171569
    17181570    The way items are selected is controlled by the widget's selection mode
    … …  
    17651617    user formed the selection.
    17661618
    1767     \section2 Searching
     1619    \section3 Searching
    17681620
    17691621    It is often useful to be able to find items within an item view widget,
    … …  
    17831635    contain the text given in the search string. This pattern can also be
    17841636    used in the list and table widgets.
    1785 */
    1786 
    1787 /*!
    1788     \page model-view-dnd.html
    1789     \contentspage model-view-programming.html Contents
    1790     \previouspage Item View Convenience Classes
    1791     \nextpage Proxy Models
    1792 
    1793     \title Using Drag and Drop with Item Views
    1794 
    1795     \tableofcontents
    1796 
    1797     \section1 Overview
     1637
     1638    \section1 Using Drag and Drop with Item Views
    17981639
    17991640    Qt's drag and drop infrastructure is fully supported by the model/view framework.
    … …  
    18141655    enabling drag and drop support in new models.
    18151656
    1816     \section1 Using Convenience Views
     1657    \section2 Using convenience views
    18171658
    18181659    Each of the types of item used with QListWidget, QTableWidget, and QTreeWidget
    … …  
    18531694    \snippet doc/src/snippets/qlistwidget-dnd/mainwindow.cpp 1
    18541695
    1855     \section1 Using Model/View Classes
     1696    \section2 Using model/view classes
    18561697
    18571698    Setting up a view for drag and drop follows the same pattern used with the
    … …  
    18751716    implementation from its base class.
    18761717
    1877     \section2 Enabling Drag and Drop for Items
     1718    \section3 Enabling drag and drop for items
    18781719
    18791720    Models indicate to views which items can be dragged, and which will accept drops,
    … …  
    18951736    function.
    18961737
    1897     \section2 Encoding Exported Data
     1738    \section3 Encoding exported data
    18981739
    18991740    When items of data are exported from a model in a drag and drop operation, they
    … …  
    19241765    class description for details.
    19251766
    1926     \section2 Inserting Dropped Data into a Model
     1767    \section3 Inserting dropped data into a model
    19271768
    19281769    The way that any given model handles dropped data depends on both its type
    … …  
    19891830    appropriate.
    19901831
    1991     \section2 Decoding Imported Data
     1832    \section3 Decoding imported data
    19921833
    19931834    Each implementation of \l{QAbstractItemModel::dropMimeData()}{dropMimeData()} must
    … …  
    20081849
    20091850    \sa {Item Views Puzzle Example}
    2010 */
    2011 
    2012 /*!
    2013     \page model-view-proxy-models.html
    2014     \contentspage model-view-programming.html Contents
    2015     \previouspage Using Drag and Drop with Item Views
    2016     \nextpage Model Subclassing Reference
    2017 
    2018     \title Proxy Models
    2019 
    2020     \tableofcontents
    2021 
    2022     \section1 Overview
     1851
     1852    \section1 Proxy models
    20231853
    20241854    In the model/view framework, items of data supplied by a single model can be shared
    … …  
    20431873    are placed between itself and the source model.
    20441874
    2045     \section1 Using Proxy Models
     1875    \section2 Using proxy models
    20461876
    20471877    Proxy models can be inserted between an existing model and any number of views.
    … …  
    20621892    classes and implementing the required comparison operations.
    20631893
    2064     \section1 Customizing Proxy Models
     1894    \section2 Customizing proxy models
    20651895
    20661896    Generally, the type of processing used in a proxy model involves mapping each item of
    … …  
    20751905    be supplied to views as pre-sorted data.
    20761906
    2077     \section2 Custom Filtering Models
     1907    \section3 Custom filtering models
    20781908
    20791909    The QSortFilterProxyModel class provides a filtering model that is fairly versatile,
    … …  
    20961926    of these functions should return false to filter out individual rows and columns.
    20971927
    2098     \section2 Custom Sorting Models
     1928    \section3 Custom sorting models
    20991929
    21001930    QSortFilterProxyModel instances use Qt's built-in qStableSort() function to set up
    … …  
    21041934    \l{QSortFilterProxyModel::lessThan()}{lessThan()} function to perform custom
    21051935    comparisons.
    2106 */
    2107 
    2108 /*!
    2109     \page model-view-model-subclassing.html
    2110     \contentspage model-view-programming.html Contents
    2111     \previouspage Proxy Models
    2112 
    2113     \title Model Subclassing Reference
    2114 
    2115     \tableofcontents
    2116 
    2117     \section1 Introduction
     1936
     1937    \section1 Model subclassing reference
    21181938
    21191939    Model subclasses need to provide implementations of many of the virtual functions
    … …  
    21441964    {"Item View Classes" Chapter of C++ GUI Programming with Qt 4}.
    21451965
    2146     \section1 Item Data Handling
     1966    \section2 Item data handling
    21471967
    21481968    Models can provide varying levels of access to the data they provide: They can be
    … …  
    21501970    others may allow items to be edited.
    21511971
    2152     \section2 Read-Only Access
     1972    \section2 Read-Only access
    21531973
    21541974    To provide read-only access to data provided by a model, the following functions
    … …  
    21862006    \endtable
    21872007
    2188     \section2 Editable Items
     2008    \section3 Editable items
    21892009
    21902010    Editable models allow items of data to be modified, and may also provide
    … …  
    22122032    \endtable
    22132033
    2214     \section2 Resizable Models
     2034    \section3 Resizable models
    22152035
    22162036    All types of model can support the insertion and removal of rows. Table models
    … …  
    22722092    signal to cause any attached views to be updated.
    22732093
    2274     \section2 Lazy Population of Model Data
     2094    \section3 Lazy population of model data
    22752095
    22762096    Lazy population of model data effectively allows requests for information
    … …  
    23062126    attempts to view the non-existent child items.
    23072127
    2308 
    2309     \section1 Navigation and Model Index Creation
     2128    \section2 Navigation and model index creation
    23102129
    23112130    Hierarchical models need to provide functions that views can call to navigate the
    23122131    tree-like structures they expose, and obtain model indexes for items.
    23132132
    2314     \section2 Parents and Children
     2133    \section3 Parents and children
    23152134
    23162135    Since the structure exposed to views is determined by the underlying data
    … …  
    23362155    the model index can be re-associated with its corresponding item later on.
    23372156
    2338     \section1 Drag and Drop Support and MIME Type Handling
     2157    \section2 Drag and drop support and MIME type handling
    23392158
    23402159    The model/view classes support drag and drop operations, providing default behavior
    … …  
    23482167    behavior.
    23492168
    2350     \section2 MIME Data
     2169    \section3 MIME data
    23512170
    23522171    By default, the built-in models and views use an internal MIME type
    … …  
    23952214    QMimeData::setHtml() functions.
    23962215
    2397     \section2 Accepting Dropped Data
     2216    \section3 Accepting dropped data
    23982217
    23992218    When a drag and drop operation is performed over a view, the underlying model is
    … …  
    24652284
    24662285    For more information about drag and drop with item views, refer to
    2467     \l{Using Drag and Drop with Item Views}.
    2468 
    2469     \section2 Convenience Views
     2286    \l{Using drag and drop with item views}.
     2287
     2288    \section3 Convenience views
    24702289
    24712290    The convenience views (QListWidget, QTableWidget, and QTreeWidget) override
    … …  
    24762295    will set the data of the target items rather than insert new rows and columns
    24772296    into the model. For more information on drag and drop in convenience views,
    2478     you can see \l{Using Drag and Drop with Item Views}.
    2479 
    2480     \section1 Performance Optimization for Large Amounts of Data
     2297    you can see \l{Using drag and drop with item views}.
     2298
     2299    \section2 Performance optimization for large amounts of data
    24812300
    24822301    The \l{QAbstractItemModel::}{canFetchMore()} function checks if the parent
    … …  
    24992318    {fetchMore()} must be reimplemented as their default implementation returns
    25002319    false and does nothing.
     2320
     2321    \keyword Model/View Classes
     2322    \section1 The model/view classes
     2323
     2324    These classes use the model/view design pattern in which the
     2325    underlying data (in the model) is kept separate from the way the
     2326    data is presented and manipulated by the user (in the view).
     2327
     2328    \annotatedlist model-view
     2329
     2330    \section1 Related examples
     2331
     2332    \list
     2333    \o \l{itemviews/dirview}{Dir View}
     2334    \o \l{itemviews/spinboxdelegate}{Spin Box Delegate}
     2335    \o \l{itemviews/pixelator}{Pixelator}
     2336    \o \l{itemviews/simpletreemodel}{Simple Tree Model}
     2337    \o \l{itemviews/chart}{Chart}
     2338    \endlist
    25012339*/

  • trunk/doc/src/frameworks-technologies/phonon.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4228/*!
    4329    \page phonon-overview.html
    44     \title Phonon Overview
    45     \ingroup frameworks-technologies
     30    \title Phonon multimedia framework
     31    \brief Using the Phonon multimedia framework in Qt.
     32    \ingroup technology-apis
     33    \ingroup best-practices
    4634
    4735    \tableofcontents
    4836
     37    \target Phonon Overview
    4938    \section1 Introduction
    5039
    … …  
    536525    possible to configure Qt without OpenGL support. In that case, you
    537526    need to run \c configure with the \c -no-opengl option.
    538 
    539     \section1 Work in Progress
    540 
    541     Phonon and its Qt backends, though fully functional for
    542     multimedia playback, are still under development. Functionality to
    543     come is the possibility to capture media and more processors for
    544     both music and video files.
    545 
    546     Another important consideration is to implement support for
    547     storing media to files; i.e., not playing back media directly.
    548 
    549     We also hope in the future to be able to support direct
    550     manipulation of media streams. This will give the programmer more
    551     freedom to manipulate streams than just through processors.
    552 
    553     Currently, the multimedia framework supports one input source. It will be
    554     possible to include several sources. This is useful in, for example, audio
    555     mixer applications where several audio sources can be sent, processed and
    556     output as a single audio stream.
    557527*/
    558528

  • trunk/doc/src/frameworks-technologies/plugins-howto.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    6248
    6349    \ingroup frameworks-technologies
     50    \ingroup qt-basic-concepts
     51       
    6452
    6553    \keyword QT_DEBUG_PLUGINS

  • trunk/doc/src/frameworks-technologies/qthelp.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact

  • trunk/doc/src/frameworks-technologies/qundo.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact

  • trunk/doc/src/frameworks-technologies/richtext.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    5137
    5238    \ingroup frameworks-technologies
    53 
     39    \ingroup qt-basic-concepts
     40       
    5441    \nextpage Rich Text Document Structure
    5542

  • trunk/doc/src/frameworks-technologies/statemachine.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact

  • trunk/doc/src/frameworks-technologies/templates.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact

  • trunk/doc/src/frameworks-technologies/threads.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    4834    \page threads.html
    4935    \title Thread Support in Qt
     36    \ingroup qt-basic-concepts
    5037    \brief A detailed discussion of thread handling in Qt.
    5138
    … …  
    227214    \page threads-reentrancy.html
    228215    \title Reentrancy and Thread-Safety
    229    
     216
    230217    \keyword reentrant
    231218    \keyword thread-safe
    232    
     219
    233220    \previouspage Synchronizing Threads
    234221    \contentspage Thread Support in Qt
    … …  
    257244    instance of the class.
    258245
     246    \note Qt classes are only documented as \e{thread-safe} if they
     247    are intended to be used by multiple threads. If a function is not
     248    marked as thread-safe or reentrant, it should not be used from
     249    different threads. If a class is not marked as thread-safe or
     250    reentrant then a specific instance of that class should not be
     251    accessed from different threads.
     252
     253    \section1 Reentrancy
     254
    259255    C++ classes are often reentrant, simply because they only access
    260256    their own member data. Any thread can call a member function on an
    … …  
    281277    end up overwriting each other, and the variable is incremented
    282278    only once!
     279
     280    \section1 Thread-Safety
    283281
    284282    Clearly, the access must be serialized: Thread A must perform
    … …  
    297295    declared with the \c mutable qualifier because we need to lock
    298296    and unlock the mutex in \c value(), which is a const function.
     297
     298    \section1 Notes on Qt Classes
    299299
    300300    Many Qt classes are \e{reentrant}, but they are not made
    … …  
    311311    (e.g. QCoreApplication::postEvent()).
    312312
    313     \note Qt Classes are only documented as \e{thread-safe} if they
    314     are intended to be used by multiple threads.
    315 
    316313    \note Terminology in the multithreading domain isn't entirely
    317314    standardized. POSIX uses definitions of reentrant and thread-safe
    … …  
    338335    possible because each thread is allowed to have its own event
    339336    loop.
    340    
    341     Topics:
    342 
    343     \tableofcontents
    344337
    345338    \section1 QObject Reentrancy
    … …  
    477470    \list
    478471
    479     \o \l{Qt::AutoConnection}{Auto Connection} (default) The behavior
    480        is the same as the Direct Connection, if the emitter and
    481        receiver are in the same thread. The behavior is the same as
    482        the Queued Connection, if the emitter and receiver are in
    483        different threads.
     472    \o \l{Qt::AutoConnection}{Auto Connection} (default) If the signal is
     473       emitted in the thread which the receiving object has affinity then
     474       the behavior is the same as the Direct Connection. Otherwise,
     475       the behavior is the same as the Queued Connection."
    484476
    485477    \o \l{Qt::DirectConnection}{Direct Connection} The slot is invoked

  • trunk/doc/src/frameworks-technologies/unicode.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
    … …  
    5945    \keyword Unicode
    6046
    61     \ingroup frameworks-technologies
     47    \ingroup technology-apis
    6248
    6349    Unicode is a multi-byte character set, portable across all major
Note: See TracChangeset for help on using the changeset viewer.