Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4949#include <QtGui/QStyle>
    5050
    51 #if QT_VERSION >= 0x040400
    5251QT_BEGIN_NAMESPACE
    53 #endif
    5452
    5553class QtButtonPropertyBrowserPrivate
    … …  
    550548*/
    551549QtButtonPropertyBrowser::QtButtonPropertyBrowser(QWidget *parent)
    552     : QtAbstractPropertyBrowser(parent)
    553 {
    554     d_ptr = new QtButtonPropertyBrowserPrivate;
     550    : QtAbstractPropertyBrowser(parent), d_ptr(new QtButtonPropertyBrowserPrivate)
     551{
    555552    d_ptr->q_ptr = this;
    556553
    … …  
    573570    for (QMap<QtButtonPropertyBrowserPrivate::WidgetItem *, QtBrowserItem *>::ConstIterator  it =  d_ptr->m_itemToIndex.constBegin(); it != icend; ++it)
    574571        delete it.key();
    575     delete d_ptr;
    576572}
    577573
    … …  
    627623}
    628624
    629 #if QT_VERSION >= 0x040400
    630625QT_END_NAMESPACE
    631 #endif
    632626
    633627#include "moc_qtbuttonpropertybrowser.cpp"

  • trunk/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4545#include "qtpropertybrowser.h"
    4646
    47 #if QT_VERSION >= 0x040400
    4847QT_BEGIN_NAMESPACE
    49 #endif
    5048
    5149class QtButtonPropertyBrowserPrivate;
    … …  
    7472private:
    7573
    76     QtButtonPropertyBrowserPrivate *d_ptr;
     74    QScopedPointer<QtButtonPropertyBrowserPrivate> d_ptr;
    7775    Q_DECLARE_PRIVATE(QtButtonPropertyBrowser)
    7876    Q_DISABLE_COPY(QtButtonPropertyBrowser)
    … …  
    8381};
    8482
    85 #if QT_VERSION >= 0x040400
    8683QT_END_NAMESPACE
    87 #endif
    8884
    8985#endif

  • trunk/tools/shared/qtpropertybrowser/qteditorfactory.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    6363#endif
    6464
    65 #if QT_VERSION >= 0x040400
    6665QT_BEGIN_NAMESPACE
    67 #endif
    6866
    6967// Set a hard coded left margin to account for the indentation
    … …  
    230228*/
    231229QtSpinBoxFactory::QtSpinBoxFactory(QObject *parent)
    232     : QtAbstractEditorFactory<QtIntPropertyManager>(parent)
    233 {
    234     d_ptr = new QtSpinBoxFactoryPrivate();
     230    : QtAbstractEditorFactory<QtIntPropertyManager>(parent), d_ptr(new QtSpinBoxFactoryPrivate())
     231{
    235232    d_ptr->q_ptr = this;
    236233
    … …  
    243240{
    244241    qDeleteAll(d_ptr->m_editorToProperty.keys());
    245     delete d_ptr;
    246242}
    247243
    … …  
    253249void QtSpinBoxFactory::connectPropertyManager(QtIntPropertyManager *manager)
    254250{
    255     connect(manager, SIGNAL(valueChanged(QtProperty *, int)),
    256                 this, SLOT(slotPropertyChanged(QtProperty *, int)));
    257     connect(manager, SIGNAL(rangeChanged(QtProperty *, int, int)),
    258                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    259     connect(manager, SIGNAL(singleStepChanged(QtProperty *, int)),
    260                 this, SLOT(slotSingleStepChanged(QtProperty *, int)));
     251    connect(manager, SIGNAL(valueChanged(QtProperty*,int)),
     252                this, SLOT(slotPropertyChanged(QtProperty*,int)));
     253    connect(manager, SIGNAL(rangeChanged(QtProperty*,int,int)),
     254                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     255    connect(manager, SIGNAL(singleStepChanged(QtProperty*,int)),
     256                this, SLOT(slotSingleStepChanged(QtProperty*,int)));
    261257}
    262258
    … …  
    276272
    277273    connect(editor, SIGNAL(valueChanged(int)), this, SLOT(slotSetValue(int)));
    278     connect(editor, SIGNAL(destroyed(QObject *)),
    279                 this, SLOT(slotEditorDestroyed(QObject *)));
     274    connect(editor, SIGNAL(destroyed(QObject*)),
     275                this, SLOT(slotEditorDestroyed(QObject*)));
    280276    return editor;
    281277}
    … …  
    288284void QtSpinBoxFactory::disconnectPropertyManager(QtIntPropertyManager *manager)
    289285{
    290     disconnect(manager, SIGNAL(valueChanged(QtProperty *, int)),
    291                 this, SLOT(slotPropertyChanged(QtProperty *, int)));
    292     disconnect(manager, SIGNAL(rangeChanged(QtProperty *, int, int)),
    293                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    294     disconnect(manager, SIGNAL(singleStepChanged(QtProperty *, int)),
    295                 this, SLOT(slotSingleStepChanged(QtProperty *, int)));
     286    disconnect(manager, SIGNAL(valueChanged(QtProperty*,int)),
     287                this, SLOT(slotPropertyChanged(QtProperty*,int)));
     288    disconnect(manager, SIGNAL(rangeChanged(QtProperty*,int,int)),
     289                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     290    disconnect(manager, SIGNAL(singleStepChanged(QtProperty*,int)),
     291                this, SLOT(slotSingleStepChanged(QtProperty*,int)));
    296292}
    297293
    … …  
    386382*/
    387383QtSliderFactory::QtSliderFactory(QObject *parent)
    388     : QtAbstractEditorFactory<QtIntPropertyManager>(parent)
    389 {
    390     d_ptr = new QtSliderFactoryPrivate();
     384    : QtAbstractEditorFactory<QtIntPropertyManager>(parent), d_ptr(new QtSliderFactoryPrivate())
     385{
    391386    d_ptr->q_ptr = this;
    392387
    … …  
    399394{
    400395    qDeleteAll(d_ptr->m_editorToProperty.keys());
    401     delete d_ptr;
    402396}
    403397
    … …  
    409403void QtSliderFactory::connectPropertyManager(QtIntPropertyManager *manager)
    410404{
    411     connect(manager, SIGNAL(valueChanged(QtProperty *, int)),
    412                 this, SLOT(slotPropertyChanged(QtProperty *, int)));
    413     connect(manager, SIGNAL(rangeChanged(QtProperty *, int, int)),
    414                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    415     connect(manager, SIGNAL(singleStepChanged(QtProperty *, int)),
    416                 this, SLOT(slotSingleStepChanged(QtProperty *, int)));
     405    connect(manager, SIGNAL(valueChanged(QtProperty*,int)),
     406                this, SLOT(slotPropertyChanged(QtProperty*,int)));
     407    connect(manager, SIGNAL(rangeChanged(QtProperty*,int,int)),
     408                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     409    connect(manager, SIGNAL(singleStepChanged(QtProperty*,int)),
     410                this, SLOT(slotSingleStepChanged(QtProperty*,int)));
    417411}
    418412
    … …  
    432426
    433427    connect(editor, SIGNAL(valueChanged(int)), this, SLOT(slotSetValue(int)));
    434     connect(editor, SIGNAL(destroyed(QObject *)),
    435                 this, SLOT(slotEditorDestroyed(QObject *)));
     428    connect(editor, SIGNAL(destroyed(QObject*)),
     429                this, SLOT(slotEditorDestroyed(QObject*)));
    436430    return editor;
    437431}
    … …  
    444438void QtSliderFactory::disconnectPropertyManager(QtIntPropertyManager *manager)
    445439{
    446     disconnect(manager, SIGNAL(valueChanged(QtProperty *, int)),
    447                 this, SLOT(slotPropertyChanged(QtProperty *, int)));
    448     disconnect(manager, SIGNAL(rangeChanged(QtProperty *, int, int)),
    449                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    450     disconnect(manager, SIGNAL(singleStepChanged(QtProperty *, int)),
    451                 this, SLOT(slotSingleStepChanged(QtProperty *, int)));
     440    disconnect(manager, SIGNAL(valueChanged(QtProperty*,int)),
     441                this, SLOT(slotPropertyChanged(QtProperty*,int)));
     442    disconnect(manager, SIGNAL(rangeChanged(QtProperty*,int,int)),
     443                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     444    disconnect(manager, SIGNAL(singleStepChanged(QtProperty*,int)),
     445                this, SLOT(slotSingleStepChanged(QtProperty*,int)));
    452446}
    453447
    … …  
    542536*/
    543537QtScrollBarFactory::QtScrollBarFactory(QObject *parent)
    544     : QtAbstractEditorFactory<QtIntPropertyManager>(parent)
    545 {
    546     d_ptr = new QtScrollBarFactoryPrivate();
     538    : QtAbstractEditorFactory<QtIntPropertyManager>(parent), d_ptr(new QtScrollBarFactoryPrivate())
     539{
    547540    d_ptr->q_ptr = this;
    548541
    … …  
    555548{
    556549    qDeleteAll(d_ptr->m_editorToProperty.keys());
    557     delete d_ptr;
    558550}
    559551
    … …  
    565557void QtScrollBarFactory::connectPropertyManager(QtIntPropertyManager *manager)
    566558{
    567     connect(manager, SIGNAL(valueChanged(QtProperty *, int)),
    568                 this, SLOT(slotPropertyChanged(QtProperty *, int)));
    569     connect(manager, SIGNAL(rangeChanged(QtProperty *, int, int)),
    570                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    571     connect(manager, SIGNAL(singleStepChanged(QtProperty *, int)),
    572                 this, SLOT(slotSingleStepChanged(QtProperty *, int)));
     559    connect(manager, SIGNAL(valueChanged(QtProperty*,int)),
     560                this, SLOT(slotPropertyChanged(QtProperty*,int)));
     561    connect(manager, SIGNAL(rangeChanged(QtProperty*,int,int)),
     562                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     563    connect(manager, SIGNAL(singleStepChanged(QtProperty*,int)),
     564                this, SLOT(slotSingleStepChanged(QtProperty*,int)));
    573565}
    574566
    … …  
    587579    editor->setValue(manager->value(property));
    588580    connect(editor, SIGNAL(valueChanged(int)), this, SLOT(slotSetValue(int)));
    589     connect(editor, SIGNAL(destroyed(QObject *)),
    590                 this, SLOT(slotEditorDestroyed(QObject *)));
     581    connect(editor, SIGNAL(destroyed(QObject*)),
     582                this, SLOT(slotEditorDestroyed(QObject*)));
    591583    return editor;
    592584}
    … …  
    599591void QtScrollBarFactory::disconnectPropertyManager(QtIntPropertyManager *manager)
    600592{
    601     disconnect(manager, SIGNAL(valueChanged(QtProperty *, int)),
    602                 this, SLOT(slotPropertyChanged(QtProperty *, int)));
    603     disconnect(manager, SIGNAL(rangeChanged(QtProperty *, int, int)),
    604                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    605     disconnect(manager, SIGNAL(singleStepChanged(QtProperty *, int)),
    606                 this, SLOT(slotSingleStepChanged(QtProperty *, int)));
     593    disconnect(manager, SIGNAL(valueChanged(QtProperty*,int)),
     594                this, SLOT(slotPropertyChanged(QtProperty*,int)));
     595    disconnect(manager, SIGNAL(rangeChanged(QtProperty*,int,int)),
     596                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     597    disconnect(manager, SIGNAL(singleStepChanged(QtProperty*,int)),
     598                this, SLOT(slotSingleStepChanged(QtProperty*,int)));
    607599}
    608600
    … …  
    664656*/
    665657QtCheckBoxFactory::QtCheckBoxFactory(QObject *parent)
    666     : QtAbstractEditorFactory<QtBoolPropertyManager>(parent)
    667 {
    668     d_ptr = new QtCheckBoxFactoryPrivate();
     658    : QtAbstractEditorFactory<QtBoolPropertyManager>(parent), d_ptr(new QtCheckBoxFactoryPrivate())
     659{
    669660    d_ptr->q_ptr = this;
    670661
    … …  
    677668{
    678669    qDeleteAll(d_ptr->m_editorToProperty.keys());
    679     delete d_ptr;
    680670}
    681671
    … …  
    687677void QtCheckBoxFactory::connectPropertyManager(QtBoolPropertyManager *manager)
    688678{
    689     connect(manager, SIGNAL(valueChanged(QtProperty *, bool)),
    690                 this, SLOT(slotPropertyChanged(QtProperty *, bool)));
     679    connect(manager, SIGNAL(valueChanged(QtProperty*,bool)),
     680                this, SLOT(slotPropertyChanged(QtProperty*,bool)));
    691681}
    692682
    … …  
    703693
    704694    connect(editor, SIGNAL(toggled(bool)), this, SLOT(slotSetValue(bool)));
    705     connect(editor, SIGNAL(destroyed(QObject *)),
    706                 this, SLOT(slotEditorDestroyed(QObject *)));
     695    connect(editor, SIGNAL(destroyed(QObject*)),
     696                this, SLOT(slotEditorDestroyed(QObject*)));
    707697    return editor;
    708698}
    … …  
    715705void QtCheckBoxFactory::disconnectPropertyManager(QtBoolPropertyManager *manager)
    716706{
    717     disconnect(manager, SIGNAL(valueChanged(QtProperty *, bool)),
    718                 this, SLOT(slotPropertyChanged(QtProperty *, bool)));
     707    disconnect(manager, SIGNAL(valueChanged(QtProperty*,bool)),
     708                this, SLOT(slotPropertyChanged(QtProperty*,bool)));
    719709}
    720710
    … …  
    839829*/
    840830QtDoubleSpinBoxFactory::QtDoubleSpinBoxFactory(QObject *parent)
    841     : QtAbstractEditorFactory<QtDoublePropertyManager>(parent)
    842 {
    843     d_ptr = new QtDoubleSpinBoxFactoryPrivate();
     831    : QtAbstractEditorFactory<QtDoublePropertyManager>(parent), d_ptr(new QtDoubleSpinBoxFactoryPrivate())
     832{
    844833    d_ptr->q_ptr = this;
    845834
    … …  
    852841{
    853842    qDeleteAll(d_ptr->m_editorToProperty.keys());
    854     delete d_ptr;
    855843}
    856844
    … …  
    862850void QtDoubleSpinBoxFactory::connectPropertyManager(QtDoublePropertyManager *manager)
    863851{
    864     connect(manager, SIGNAL(valueChanged(QtProperty *, double)),
    865                 this, SLOT(slotPropertyChanged(QtProperty *, double)));
    866     connect(manager, SIGNAL(rangeChanged(QtProperty *, double, double)),
    867                 this, SLOT(slotRangeChanged(QtProperty *, double, double)));
    868     connect(manager, SIGNAL(singleStepChanged(QtProperty *, double)),
    869                 this, SLOT(slotSingleStepChanged(QtProperty *, double)));
    870     connect(manager, SIGNAL(decimalsChanged(QtProperty *, int)),
    871                 this, SLOT(slotDecimalsChanged(QtProperty *, int)));
     852    connect(manager, SIGNAL(valueChanged(QtProperty*,double)),
     853                this, SLOT(slotPropertyChanged(QtProperty*,double)));
     854    connect(manager, SIGNAL(rangeChanged(QtProperty*,double,double)),
     855                this, SLOT(slotRangeChanged(QtProperty*,double,double)));
     856    connect(manager, SIGNAL(singleStepChanged(QtProperty*,double)),
     857                this, SLOT(slotSingleStepChanged(QtProperty*,double)));
     858    connect(manager, SIGNAL(decimalsChanged(QtProperty*,int)),
     859                this, SLOT(slotDecimalsChanged(QtProperty*,int)));
    872860}
    873861
    … …  
    888876
    889877    connect(editor, SIGNAL(valueChanged(double)), this, SLOT(slotSetValue(double)));
    890     connect(editor, SIGNAL(destroyed(QObject *)),
    891                 this, SLOT(slotEditorDestroyed(QObject *)));
     878    connect(editor, SIGNAL(destroyed(QObject*)),
     879                this, SLOT(slotEditorDestroyed(QObject*)));
    892880    return editor;
    893881}
    … …  
    900888void QtDoubleSpinBoxFactory::disconnectPropertyManager(QtDoublePropertyManager *manager)
    901889{
    902     disconnect(manager, SIGNAL(valueChanged(QtProperty *, double)),
    903                 this, SLOT(slotPropertyChanged(QtProperty *, double)));
    904     disconnect(manager, SIGNAL(rangeChanged(QtProperty *, double, double)),
    905                 this, SLOT(slotRangeChanged(QtProperty *, double, double)));
    906     disconnect(manager, SIGNAL(singleStepChanged(QtProperty *, double)),
    907                 this, SLOT(slotSingleStepChanged(QtProperty *, double)));
    908     disconnect(manager, SIGNAL(decimalsChanged(QtProperty *, int)),
    909                 this, SLOT(slotDecimalsChanged(QtProperty *, int)));
     890    disconnect(manager, SIGNAL(valueChanged(QtProperty*,double)),
     891                this, SLOT(slotPropertyChanged(QtProperty*,double)));
     892    disconnect(manager, SIGNAL(rangeChanged(QtProperty*,double,double)),
     893                this, SLOT(slotRangeChanged(QtProperty*,double,double)));
     894    disconnect(manager, SIGNAL(singleStepChanged(QtProperty*,double)),
     895                this, SLOT(slotSingleStepChanged(QtProperty*,double)));
     896    disconnect(manager, SIGNAL(decimalsChanged(QtProperty*,int)),
     897                this, SLOT(slotDecimalsChanged(QtProperty*,int)));
    910898}
    911899
    … …  
    994982*/
    995983QtLineEditFactory::QtLineEditFactory(QObject *parent)
    996     : QtAbstractEditorFactory<QtStringPropertyManager>(parent)
    997 {
    998     d_ptr = new QtLineEditFactoryPrivate();
     984    : QtAbstractEditorFactory<QtStringPropertyManager>(parent), d_ptr(new QtLineEditFactoryPrivate())
     985{
    999986    d_ptr->q_ptr = this;
    1000987
    … …  
    1007994{
    1008995    qDeleteAll(d_ptr->m_editorToProperty.keys());
    1009     delete d_ptr;
    1010996}
    1011997
    … …  
    10171003void QtLineEditFactory::connectPropertyManager(QtStringPropertyManager *manager)
    10181004{
    1019     connect(manager, SIGNAL(valueChanged(QtProperty *, const QString &)),
    1020                 this, SLOT(slotPropertyChanged(QtProperty *, const QString &)));
    1021     connect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
    1022                 this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
     1005    connect(manager, SIGNAL(valueChanged(QtProperty*,QString)),
     1006                this, SLOT(slotPropertyChanged(QtProperty*,QString)));
     1007    connect(manager, SIGNAL(regExpChanged(QtProperty*,QRegExp)),
     1008                this, SLOT(slotRegExpChanged(QtProperty*,QRegExp)));
    10231009}
    10241010
    … …  
    10401026    editor->setText(manager->value(property));
    10411027
    1042     connect(editor, SIGNAL(textEdited(const QString &)),
    1043                 this, SLOT(slotSetValue(const QString &)));
    1044     connect(editor, SIGNAL(destroyed(QObject *)),
    1045                 this, SLOT(slotEditorDestroyed(QObject *)));
     1028    connect(editor, SIGNAL(textEdited(QString)),
     1029                this, SLOT(slotSetValue(QString)));
     1030    connect(editor, SIGNAL(destroyed(QObject*)),
     1031                this, SLOT(slotEditorDestroyed(QObject*)));
    10461032    return editor;
    10471033}
    … …  
    10541040void QtLineEditFactory::disconnectPropertyManager(QtStringPropertyManager *manager)
    10551041{
    1056     disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QString &)),
    1057                 this, SLOT(slotPropertyChanged(QtProperty *, const QString &)));
    1058     disconnect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
    1059                 this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
     1042    disconnect(manager, SIGNAL(valueChanged(QtProperty*,QString)),
     1043                this, SLOT(slotPropertyChanged(QtProperty*,QString)));
     1044    disconnect(manager, SIGNAL(regExpChanged(QtProperty*,QRegExp)),
     1045                this, SLOT(slotRegExpChanged(QtProperty*,QRegExp)));
    10601046}
    10611047
    … …  
    11371123*/
    11381124QtDateEditFactory::QtDateEditFactory(QObject *parent)
    1139     : QtAbstractEditorFactory<QtDatePropertyManager>(parent)
    1140 {
    1141     d_ptr = new QtDateEditFactoryPrivate();
     1125    : QtAbstractEditorFactory<QtDatePropertyManager>(parent), d_ptr(new QtDateEditFactoryPrivate())
     1126{
    11421127    d_ptr->q_ptr = this;
    11431128
    … …  
    11501135{
    11511136    qDeleteAll(d_ptr->m_editorToProperty.keys());
    1152     delete d_ptr;
    11531137}
    11541138
    … …  
    11601144void QtDateEditFactory::connectPropertyManager(QtDatePropertyManager *manager)
    11611145{
    1162     connect(manager, SIGNAL(valueChanged(QtProperty *, const QDate &)),
    1163                 this, SLOT(slotPropertyChanged(QtProperty *, const QDate &)));
    1164     connect(manager, SIGNAL(rangeChanged(QtProperty *, const QDate &, const QDate &)),
    1165                 this, SLOT(slotRangeChanged(QtProperty *, const QDate &, const QDate &)));
     1146    connect(manager, SIGNAL(valueChanged(QtProperty*,QDate)),
     1147                this, SLOT(slotPropertyChanged(QtProperty*,QDate)));
     1148    connect(manager, SIGNAL(rangeChanged(QtProperty*,QDate,QDate)),
     1149                this, SLOT(slotRangeChanged(QtProperty*,QDate,QDate)));
    11661150}
    11671151
    … …  
    11791163    editor->setDate(manager->value(property));
    11801164
    1181     connect(editor, SIGNAL(dateChanged(const QDate &)),
    1182                 this, SLOT(slotSetValue(const QDate &)));
    1183     connect(editor, SIGNAL(destroyed(QObject *)),
    1184                 this, SLOT(slotEditorDestroyed(QObject *)));
     1165    connect(editor, SIGNAL(dateChanged(QDate)),
     1166                this, SLOT(slotSetValue(QDate)));
     1167    connect(editor, SIGNAL(destroyed(QObject*)),
     1168                this, SLOT(slotEditorDestroyed(QObject*)));
    11851169    return editor;
    11861170}
    … …  
    11931177void QtDateEditFactory::disconnectPropertyManager(QtDatePropertyManager *manager)
    11941178{
    1195     disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QDate &)),
    1196                 this, SLOT(slotPropertyChanged(QtProperty *, const QDate &)));
    1197     disconnect(manager, SIGNAL(rangeChanged(QtProperty *, const QDate &, const QDate &)),
    1198                 this, SLOT(slotRangeChanged(QtProperty *, const QDate &, const QDate &)));
     1179    disconnect(manager, SIGNAL(valueChanged(QtProperty*,QDate)),
     1180                this, SLOT(slotPropertyChanged(QtProperty*,QDate)));
     1181    disconnect(manager, SIGNAL(rangeChanged(QtProperty*,QDate,QDate)),
     1182                this, SLOT(slotRangeChanged(QtProperty*,QDate,QDate)));
    11991183}
    12001184
    … …  
    12551239*/
    12561240QtTimeEditFactory::QtTimeEditFactory(QObject *parent)
    1257     : QtAbstractEditorFactory<QtTimePropertyManager>(parent)
    1258 {
    1259     d_ptr = new QtTimeEditFactoryPrivate();
     1241    : QtAbstractEditorFactory<QtTimePropertyManager>(parent), d_ptr(new QtTimeEditFactoryPrivate())
     1242{
    12601243    d_ptr->q_ptr = this;
    12611244
    … …  
    12681251{
    12691252    qDeleteAll(d_ptr->m_editorToProperty.keys());
    1270     delete d_ptr;
    12711253}
    12721254
    … …  
    12781260void QtTimeEditFactory::connectPropertyManager(QtTimePropertyManager *manager)
    12791261{
    1280     connect(manager, SIGNAL(valueChanged(QtProperty *, const QTime &)),
    1281                 this, SLOT(slotPropertyChanged(QtProperty *, const QTime &)));
     1262    connect(manager, SIGNAL(valueChanged(QtProperty*,QTime)),
     1263                this, SLOT(slotPropertyChanged(QtProperty*,QTime)));
    12821264}
    12831265
    … …  
    12931275    editor->setTime(manager->value(property));
    12941276
    1295     connect(editor, SIGNAL(timeChanged(const QTime &)),
    1296                 this, SLOT(slotSetValue(const QTime &)));
    1297     connect(editor, SIGNAL(destroyed(QObject *)),
    1298                 this, SLOT(slotEditorDestroyed(QObject *)));
     1277    connect(editor, SIGNAL(timeChanged(QTime)),
     1278                this, SLOT(slotSetValue(QTime)));
     1279    connect(editor, SIGNAL(destroyed(QObject*)),
     1280                this, SLOT(slotEditorDestroyed(QObject*)));
    12991281    return editor;
    13001282}
    … …  
    13071289void QtTimeEditFactory::disconnectPropertyManager(QtTimePropertyManager *manager)
    13081290{
    1309     disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QTime &)),
    1310                 this, SLOT(slotPropertyChanged(QtProperty *, const QTime &)));
     1291    disconnect(manager, SIGNAL(valueChanged(QtProperty*,QTime)),
     1292                this, SLOT(slotPropertyChanged(QtProperty*,QTime)));
    13111293}
    13121294
    … …  
    13701352*/
    13711353QtDateTimeEditFactory::QtDateTimeEditFactory(QObject *parent)
    1372     : QtAbstractEditorFactory<QtDateTimePropertyManager>(parent)
    1373 {
    1374     d_ptr = new QtDateTimeEditFactoryPrivate();
     1354    : QtAbstractEditorFactory<QtDateTimePropertyManager>(parent), d_ptr(new QtDateTimeEditFactoryPrivate())
     1355{
    13751356    d_ptr->q_ptr = this;
    13761357
    … …  
    13831364{
    13841365    qDeleteAll(d_ptr->m_editorToProperty.keys());
    1385     delete d_ptr;
    13861366}
    13871367
    … …  
    13931373void QtDateTimeEditFactory::connectPropertyManager(QtDateTimePropertyManager *manager)
    13941374{
    1395     connect(manager, SIGNAL(valueChanged(QtProperty *, const QDateTime &)),
    1396                 this, SLOT(slotPropertyChanged(QtProperty *, const QDateTime &)));
     1375    connect(manager, SIGNAL(valueChanged(QtProperty*,QDateTime)),
     1376                this, SLOT(slotPropertyChanged(QtProperty*,QDateTime)));
    13971377}
    13981378
    … …  
    14081388    editor->setDateTime(manager->value(property));
    14091389
    1410     connect(editor, SIGNAL(dateTimeChanged(const QDateTime &)),
    1411                 this, SLOT(slotSetValue(const QDateTime &)));
    1412     connect(editor, SIGNAL(destroyed(QObject *)),
    1413                 this, SLOT(slotEditorDestroyed(QObject *)));
     1390    connect(editor, SIGNAL(dateTimeChanged(QDateTime)),
     1391                this, SLOT(slotSetValue(QDateTime)));
     1392    connect(editor, SIGNAL(destroyed(QObject*)),
     1393                this, SLOT(slotEditorDestroyed(QObject*)));
    14141394    return editor;
    14151395}
    … …  
    14221402void QtDateTimeEditFactory::disconnectPropertyManager(QtDateTimePropertyManager *manager)
    14231403{
    1424     disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QDateTime &)),
    1425                 this, SLOT(slotPropertyChanged(QtProperty *, const QDateTime &)));
     1404    disconnect(manager, SIGNAL(valueChanged(QtProperty*,QDateTime)),
     1405                this, SLOT(slotPropertyChanged(QtProperty*,QDateTime)));
    14261406}
    14271407
    … …  
    14841464*/
    14851465QtKeySequenceEditorFactory::QtKeySequenceEditorFactory(QObject *parent)
    1486     : QtAbstractEditorFactory<QtKeySequencePropertyManager>(parent)
    1487 {
    1488     d_ptr = new QtKeySequenceEditorFactoryPrivate();
     1466    : QtAbstractEditorFactory<QtKeySequencePropertyManager>(parent), d_ptr(new QtKeySequenceEditorFactoryPrivate())
     1467{
    14891468    d_ptr->q_ptr = this;
    14901469
    … …  
    14971476{
    14981477    qDeleteAll(d_ptr->m_editorToProperty.keys());
    1499     delete d_ptr;
    15001478}
    15011479
    … …  
    15071485void QtKeySequenceEditorFactory::connectPropertyManager(QtKeySequencePropertyManager *manager)
    15081486{
    1509     connect(manager, SIGNAL(valueChanged(QtProperty *, const QKeySequence &)),
    1510                 this, SLOT(slotPropertyChanged(QtProperty *, const QKeySequence &)));
     1487    connect(manager, SIGNAL(valueChanged(QtProperty*,QKeySequence)),
     1488                this, SLOT(slotPropertyChanged(QtProperty*,QKeySequence)));
    15111489}
    15121490
    … …  
    15221500    editor->setKeySequence(manager->value(property));
    15231501
    1524     connect(editor, SIGNAL(keySequenceChanged(const QKeySequence &)),
    1525                 this, SLOT(slotSetValue(const QKeySequence &)));
    1526     connect(editor, SIGNAL(destroyed(QObject *)),
    1527                 this, SLOT(slotEditorDestroyed(QObject *)));
     1502    connect(editor, SIGNAL(keySequenceChanged(QKeySequence)),
     1503                this, SLOT(slotSetValue(QKeySequence)));
     1504    connect(editor, SIGNAL(destroyed(QObject*)),
     1505                this, SLOT(slotEditorDestroyed(QObject*)));
    15281506    return editor;
    15291507}
    … …  
    15361514void QtKeySequenceEditorFactory::disconnectPropertyManager(QtKeySequencePropertyManager *manager)
    15371515{
    1538     disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QKeySequence &)),
    1539                 this, SLOT(slotPropertyChanged(QtProperty *, const QKeySequence &)));
     1516    disconnect(manager, SIGNAL(valueChanged(QtProperty*,QKeySequence)),
     1517                this, SLOT(slotPropertyChanged(QtProperty*,QKeySequence)));
    15401518}
    15411519
    … …  
    17681746*/
    17691747QtCharEditorFactory::QtCharEditorFactory(QObject *parent)
    1770     : QtAbstractEditorFactory<QtCharPropertyManager>(parent)
    1771 {
    1772     d_ptr = new QtCharEditorFactoryPrivate();
     1748    : QtAbstractEditorFactory<QtCharPropertyManager>(parent), d_ptr(new QtCharEditorFactoryPrivate())
     1749{
    17731750    d_ptr->q_ptr = this;
    17741751
    … …  
    17811758{
    17821759    qDeleteAll(d_ptr->m_editorToProperty.keys());
    1783     delete d_ptr;
    17841760}
    17851761
    … …  
    17911767void QtCharEditorFactory::connectPropertyManager(QtCharPropertyManager *manager)
    17921768{
    1793     connect(manager, SIGNAL(valueChanged(QtProperty *, const QChar &)),
    1794                 this, SLOT(slotPropertyChanged(QtProperty *, const QChar &)));
     1769    connect(manager, SIGNAL(valueChanged(QtProperty*,QChar)),
     1770                this, SLOT(slotPropertyChanged(QtProperty*,QChar)));
    17951771}
    17961772
    … …  
    18061782    editor->setValue(manager->value(property));
    18071783
    1808     connect(editor, SIGNAL(valueChanged(const QChar &)),
    1809                 this, SLOT(slotSetValue(const QChar &)));
    1810     connect(editor, SIGNAL(destroyed(QObject *)),
    1811                 this, SLOT(slotEditorDestroyed(QObject *)));
     1784    connect(editor, SIGNAL(valueChanged(QChar)),
     1785                this, SLOT(slotSetValue(QChar)));
     1786    connect(editor, SIGNAL(destroyed(QObject*)),
     1787                this, SLOT(slotEditorDestroyed(QObject*)));
    18121788    return editor;
    18131789}
    … …  
    18201796void QtCharEditorFactory::disconnectPropertyManager(QtCharPropertyManager *manager)
    18211797{
    1822     disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QChar &)),
    1823                 this, SLOT(slotPropertyChanged(QtProperty *, const QChar &)));
     1798    disconnect(manager, SIGNAL(valueChanged(QtProperty*,QChar)),
     1799                this, SLOT(slotPropertyChanged(QtProperty*,QChar)));
    18241800}
    18251801
    … …  
    19321908*/
    19331909QtEnumEditorFactory::QtEnumEditorFactory(QObject *parent)
    1934     : QtAbstractEditorFactory<QtEnumPropertyManager>(parent)
    1935 {
    1936     d_ptr = new QtEnumEditorFactoryPrivate();
     1910    : QtAbstractEditorFactory<QtEnumPropertyManager>(parent), d_ptr(new QtEnumEditorFactoryPrivate())
     1911{
    19371912    d_ptr->q_ptr = this;
    19381913
    … …  
    19451920{
    19461921    qDeleteAll(d_ptr->m_editorToProperty.keys());
    1947     delete d_ptr;
    19481922}
    19491923
    … …  
    19551929void QtEnumEditorFactory::connectPropertyManager(QtEnumPropertyManager *manager)
    19561930{
    1957     connect(manager, SIGNAL(valueChanged(QtProperty *, int)),
    1958                 this, SLOT(slotPropertyChanged(QtProperty *, int)));
    1959     connect(manager, SIGNAL(enumNamesChanged(QtProperty *, const QStringList &)),
    1960                 this, SLOT(slotEnumNamesChanged(QtProperty *, const QStringList &)));
     1931    connect(manager, SIGNAL(valueChanged(QtProperty*,int)),
     1932                this, SLOT(slotPropertyChanged(QtProperty*,int)));
     1933    connect(manager, SIGNAL(enumNamesChanged(QtProperty*,QStringList)),
     1934                this, SLOT(slotEnumNamesChanged(QtProperty*,QStringList)));
    19611935}
    19621936
    … …  
    19811955
    19821956    connect(editor, SIGNAL(currentIndexChanged(int)), this, SLOT(slotSetValue(int)));
    1983     connect(editor, SIGNAL(destroyed(QObject *)),
    1984                 this, SLOT(slotEditorDestroyed(QObject *)));
     1957    connect(editor, SIGNAL(destroyed(QObject*)),
     1958                this, SLOT(slotEditorDestroyed(QObject*)));
    19851959    return editor;
    19861960}
    … …  
    19931967void QtEnumEditorFactory::disconnectPropertyManager(QtEnumPropertyManager *manager)
    19941968{
    1995     disconnect(manager, SIGNAL(valueChanged(QtProperty *, int)),
    1996                 this, SLOT(slotPropertyChanged(QtProperty *, int)));
    1997     disconnect(manager, SIGNAL(enumNamesChanged(QtProperty *, const QStringList &)),
    1998                 this, SLOT(slotEnumNamesChanged(QtProperty *, const QStringList &)));
     1969    disconnect(manager, SIGNAL(valueChanged(QtProperty*,int)),
     1970                this, SLOT(slotPropertyChanged(QtProperty*,int)));
     1971    disconnect(manager, SIGNAL(enumNamesChanged(QtProperty*,QStringList)),
     1972                this, SLOT(slotEnumNamesChanged(QtProperty*,QStringList)));
    19991973}
    20001974
    … …  
    20972071*/
    20982072QtCursorEditorFactory::QtCursorEditorFactory(QObject *parent)
    2099     : QtAbstractEditorFactory<QtCursorPropertyManager>(parent)
    2100 {
    2101     d_ptr = new QtCursorEditorFactoryPrivate();
     2073    : QtAbstractEditorFactory<QtCursorPropertyManager>(parent), d_ptr(new QtCursorEditorFactoryPrivate())
     2074{
    21022075    d_ptr->q_ptr = this;
    21032076
    21042077    d_ptr->m_enumEditorFactory = new QtEnumEditorFactory(this);
    21052078    d_ptr->m_enumPropertyManager = new QtEnumPropertyManager(this);
    2106     connect(d_ptr->m_enumPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    2107                 this, SLOT(slotEnumChanged(QtProperty *, int)));
     2079    connect(d_ptr->m_enumPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     2080                this, SLOT(slotEnumChanged(QtProperty*,int)));
    21082081    d_ptr->m_enumEditorFactory->addPropertyManager(d_ptr->m_enumPropertyManager);
    21092082}
    … …  
    21142087QtCursorEditorFactory::~QtCursorEditorFactory()
    21152088{
    2116     delete d_ptr;
    21172089}
    21182090
    … …  
    21242096void QtCursorEditorFactory::connectPropertyManager(QtCursorPropertyManager *manager)
    21252097{
    2126     connect(manager, SIGNAL(valueChanged(QtProperty *, const QCursor &)),
    2127                 this, SLOT(slotPropertyChanged(QtProperty *, const QCursor &)));
     2098    connect(manager, SIGNAL(valueChanged(QtProperty*,QCursor)),
     2099                this, SLOT(slotPropertyChanged(QtProperty*,QCursor)));
    21282100}
    21292101
    … …  
    21532125    d_ptr->m_enumToEditors[enumProp].append(editor);
    21542126    d_ptr->m_editorToEnum[editor] = enumProp;
    2155     connect(editor, SIGNAL(destroyed(QObject *)),
    2156                 this, SLOT(slotEditorDestroyed(QObject *)));
     2127    connect(editor, SIGNAL(destroyed(QObject*)),
     2128                this, SLOT(slotEditorDestroyed(QObject*)));
    21572129    return editor;
    21582130}
    … …  
    21652137void QtCursorEditorFactory::disconnectPropertyManager(QtCursorPropertyManager *manager)
    21662138{
    2167     disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QCursor &)),
    2168                 this, SLOT(slotPropertyChanged(QtProperty *, const QCursor &)));
     2139    disconnect(manager, SIGNAL(valueChanged(QtProperty*,QCursor)),
     2140                this, SLOT(slotPropertyChanged(QtProperty*,QCursor)));
    21692141}
    21702142
    … …  
    22312203void QtColorEditWidget::buttonClicked()
    22322204{
    2233     bool ok = false;
    2234     QRgb oldRgba = m_color.rgba();
    2235     QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this);
    2236     if (ok && newRgba != oldRgba) {
    2237         setValue(QColor::fromRgba(newRgba));
     2205    const QColor newColor = QColorDialog::getColor(m_color, this, QString(), QColorDialog::ShowAlphaChannel);
     2206    if (newColor.isValid() && newColor != m_color) {
     2207        setValue(newColor);
    22382208        emit valueChanged(m_color);
    22392209    }
    … …  
    23312301{
    23322302    qDeleteAll(d_ptr->m_editorToProperty.keys());
    2333     delete d_ptr;
    23342303}
    23352304
    … …  
    23562325    editor->setValue(manager->value(property));
    23572326    connect(editor, SIGNAL(valueChanged(QColor)), this, SLOT(slotSetValue(QColor)));
    2358     connect(editor, SIGNAL(destroyed(QObject *)), this, SLOT(slotEditorDestroyed(QObject *)));
     2327    connect(editor, SIGNAL(destroyed(QObject*)), this, SLOT(slotEditorDestroyed(QObject*)));
    23592328    return editor;
    23602329}
    … …  
    25452514{
    25462515    qDeleteAll(d_ptr->m_editorToProperty.keys());
    2547     delete d_ptr;
    25482516}
    25492517
    … …  
    25702538    editor->setValue(manager->value(property));
    25712539    connect(editor, SIGNAL(valueChanged(QFont)), this, SLOT(slotSetValue(QFont)));
    2572     connect(editor, SIGNAL(destroyed(QObject *)), this, SLOT(slotEditorDestroyed(QObject *)));
     2540    connect(editor, SIGNAL(destroyed(QObject*)), this, SLOT(slotEditorDestroyed(QObject*)));
    25732541    return editor;
    25742542}
    … …  
    25842552}
    25852553
    2586 #if QT_VERSION >= 0x040400
    25872554QT_END_NAMESPACE
    2588 #endif
    25892555
    25902556#include "moc_qteditorfactory.cpp"

  • trunk/tools/shared/qtpropertybrowser/qteditorfactory.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4545#include "qtpropertymanager.h"
    4646
    47 #if QT_VERSION >= 0x040400
    4847QT_BEGIN_NAMESPACE
    49 #endif
    5048
    5149class QtSpinBoxFactoryPrivate;
    … …  
    6361    void disconnectPropertyManager(QtIntPropertyManager *manager);
    6462private:
    65     QtSpinBoxFactoryPrivate *d_ptr;
     63    QScopedPointer<QtSpinBoxFactoryPrivate> d_ptr;
    6664    Q_DECLARE_PRIVATE(QtSpinBoxFactory)
    6765    Q_DISABLE_COPY(QtSpinBoxFactory)
    … …  
    8785    void disconnectPropertyManager(QtIntPropertyManager *manager);
    8886private:
    89     QtSliderFactoryPrivate *d_ptr;
     87    QScopedPointer<QtSliderFactoryPrivate> d_ptr;
    9088    Q_DECLARE_PRIVATE(QtSliderFactory)
    9189    Q_DISABLE_COPY(QtSliderFactory)
    … …  
    111109    void disconnectPropertyManager(QtIntPropertyManager *manager);
    112110private:
    113     QtScrollBarFactoryPrivate *d_ptr;
     111    QScopedPointer<QtScrollBarFactoryPrivate> d_ptr;
    114112    Q_DECLARE_PRIVATE(QtScrollBarFactory)
    115113    Q_DISABLE_COPY(QtScrollBarFactory)
    … …  
    135133    void disconnectPropertyManager(QtBoolPropertyManager *manager);
    136134private:
    137     QtCheckBoxFactoryPrivate *d_ptr;
     135    QScopedPointer<QtCheckBoxFactoryPrivate> d_ptr;
    138136    Q_DECLARE_PRIVATE(QtCheckBoxFactory)
    139137    Q_DISABLE_COPY(QtCheckBoxFactory)
    … …  
    157155    void disconnectPropertyManager(QtDoublePropertyManager *manager);
    158156private:
    159     QtDoubleSpinBoxFactoryPrivate *d_ptr;
     157    QScopedPointer<QtDoubleSpinBoxFactoryPrivate> d_ptr;
    160158    Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory)
    161159    Q_DISABLE_COPY(QtDoubleSpinBoxFactory)
    … …  
    182180    void disconnectPropertyManager(QtStringPropertyManager *manager);
    183181private:
    184     QtLineEditFactoryPrivate *d_ptr;
     182    QScopedPointer<QtLineEditFactoryPrivate> d_ptr;
    185183    Q_DECLARE_PRIVATE(QtLineEditFactory)
    186184    Q_DISABLE_COPY(QtLineEditFactory)
    … …  
    205203    void disconnectPropertyManager(QtDatePropertyManager *manager);
    206204private:
    207     QtDateEditFactoryPrivate *d_ptr;
     205    QScopedPointer<QtDateEditFactoryPrivate> d_ptr;
    208206    Q_DECLARE_PRIVATE(QtDateEditFactory)
    209207    Q_DISABLE_COPY(QtDateEditFactory)
    … …  
    229227    void disconnectPropertyManager(QtTimePropertyManager *manager);
    230228private:
    231     QtTimeEditFactoryPrivate *d_ptr;
     229    QScopedPointer<QtTimeEditFactoryPrivate> d_ptr;
    232230    Q_DECLARE_PRIVATE(QtTimeEditFactory)
    233231    Q_DISABLE_COPY(QtTimeEditFactory)
    … …  
    251249    void disconnectPropertyManager(QtDateTimePropertyManager *manager);
    252250private:
    253     QtDateTimeEditFactoryPrivate *d_ptr;
     251    QScopedPointer<QtDateTimeEditFactoryPrivate> d_ptr;
    254252    Q_DECLARE_PRIVATE(QtDateTimeEditFactory)
    255253    Q_DISABLE_COPY(QtDateTimeEditFactory)
    … …  
    273271    void disconnectPropertyManager(QtKeySequencePropertyManager *manager);
    274272private:
    275     QtKeySequenceEditorFactoryPrivate *d_ptr;
     273    QScopedPointer<QtKeySequenceEditorFactoryPrivate> d_ptr;
    276274    Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory)
    277275    Q_DISABLE_COPY(QtKeySequenceEditorFactory)
    … …  
    295293    void disconnectPropertyManager(QtCharPropertyManager *manager);
    296294private:
    297     QtCharEditorFactoryPrivate *d_ptr;
     295    QScopedPointer<QtCharEditorFactoryPrivate> d_ptr;
    298296    Q_DECLARE_PRIVATE(QtCharEditorFactory)
    299297    Q_DISABLE_COPY(QtCharEditorFactory)
    … …  
    317315    void disconnectPropertyManager(QtEnumPropertyManager *manager);
    318316private:
    319     QtEnumEditorFactoryPrivate *d_ptr;
     317    QScopedPointer<QtEnumEditorFactoryPrivate> d_ptr;
    320318    Q_DECLARE_PRIVATE(QtEnumEditorFactory)
    321319    Q_DISABLE_COPY(QtEnumEditorFactory)
    … …  
    343341    void disconnectPropertyManager(QtCursorPropertyManager *manager);
    344342private:
    345     QtCursorEditorFactoryPrivate *d_ptr;
     343    QScopedPointer<QtCursorEditorFactoryPrivate> d_ptr;
    346344    Q_DECLARE_PRIVATE(QtCursorEditorFactory)
    347345    Q_DISABLE_COPY(QtCursorEditorFactory)
    … …  
    365363    void disconnectPropertyManager(QtColorPropertyManager *manager);
    366364private:
    367     QtColorEditorFactoryPrivate *d_ptr;
     365    QScopedPointer<QtColorEditorFactoryPrivate> d_ptr;
    368366    Q_DECLARE_PRIVATE(QtColorEditorFactory)
    369367    Q_DISABLE_COPY(QtColorEditorFactory)
    … …  
    387385    void disconnectPropertyManager(QtFontPropertyManager *manager);
    388386private:
    389     QtFontEditorFactoryPrivate *d_ptr;
     387    QScopedPointer<QtFontEditorFactoryPrivate> d_ptr;
    390388    Q_DECLARE_PRIVATE(QtFontEditorFactory)
    391389    Q_DISABLE_COPY(QtFontEditorFactory)
    … …  
    395393};
    396394
    397 #if QT_VERSION >= 0x040400
    398395QT_END_NAMESPACE
     396
    399397#endif
    400 
    401 #endif

  • trunk/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4848#include <QtCore/QMap>
    4949
    50 #if QT_VERSION >= 0x040400
    5150QT_BEGIN_NAMESPACE
    52 #endif
    5351
    5452class QtGroupBoxPropertyBrowserPrivate
    … …  
    479477*/
    480478QtGroupBoxPropertyBrowser::QtGroupBoxPropertyBrowser(QWidget *parent)
    481     : QtAbstractPropertyBrowser(parent)
    482 {
    483     d_ptr = new QtGroupBoxPropertyBrowserPrivate;
     479    : QtAbstractPropertyBrowser(parent), d_ptr(new QtGroupBoxPropertyBrowserPrivate)
     480{
    484481    d_ptr->q_ptr = this;
    485482
    … …  
    502499    for (QMap<QtGroupBoxPropertyBrowserPrivate::WidgetItem *, QtBrowserItem *>::ConstIterator it = d_ptr->m_itemToIndex.constBegin(); it != icend; ++it)
    503500        delete it.key();
    504     delete d_ptr;
    505501}
    506502
    … …  
    529525}
    530526
    531 #if QT_VERSION >= 0x040400
    532527QT_END_NAMESPACE
    533 #endif
    534528
    535529#include "moc_qtgroupboxpropertybrowser.cpp"

  • trunk/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4545#include "qtpropertybrowser.h"
    4646
    47 #if QT_VERSION >= 0x040400
    4847QT_BEGIN_NAMESPACE
    49 #endif
    5048
    5149class QtGroupBoxPropertyBrowserPrivate;
    … …  
    6664private:
    6765
    68     QtGroupBoxPropertyBrowserPrivate *d_ptr;
     66    QScopedPointer<QtGroupBoxPropertyBrowserPrivate> d_ptr;
    6967    Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser)
    7068    Q_DISABLE_COPY(QtGroupBoxPropertyBrowser)
    … …  
    7472};
    7573
    76 #if QT_VERSION >= 0x040400
    7774QT_END_NAMESPACE
    78 #endif
    7975
    8076#endif

  • trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4949#endif
    5050
    51 #if QT_VERSION >= 0x040400
    5251QT_BEGIN_NAMESPACE
    53 #endif
    5452
    5553class QtPropertyPrivate
    … …  
    145143*/
    146144QtProperty::QtProperty(QtAbstractPropertyManager *manager)
    147 {
    148     d_ptr = new QtPropertyPrivate(manager);
     145    : d_ptr(new QtPropertyPrivate(manager))
     146{
    149147    d_ptr->q_ptr = this;
    150148}
    … …  
    180178        property->d_ptr->m_subItems.removeAll(this);
    181179    }
    182     delete d_ptr;
    183180}
    184181
    … …  
    641638*/
    642639QtAbstractPropertyManager::QtAbstractPropertyManager(QObject *parent)
    643     : QObject(parent)
    644 {
    645     d_ptr = new QtAbstractPropertyManagerPrivate;
     640    : QObject(parent), d_ptr(new QtAbstractPropertyManagerPrivate)
     641{
    646642    d_ptr->q_ptr = this;
    647643
    … …  
    655651{
    656652    clear();
    657     delete d_ptr;
    658653}
    659654
    … …  
    11701165
    11711166QtBrowserItem::QtBrowserItem(QtAbstractPropertyBrowser *browser, QtProperty *property, QtBrowserItem *parent)
    1172 {
    1173     d_ptr = new QtBrowserItemPrivate(browser, property, parent);
     1167    : d_ptr(new QtBrowserItemPrivate(browser, property, parent))
     1168{
    11741169    d_ptr->q_ptr = this;
    11751170}
    … …  
    11771172QtBrowserItem::~QtBrowserItem()
    11781173{
    1179     delete d_ptr;
    11801174}
    11811175
    … …  
    12501244        q_ptr->connect(manager, SIGNAL(propertyRemoved(QtProperty *,
    12511245                            QtProperty *)),
    1252                 q_ptr, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
    1253         q_ptr->connect(manager, SIGNAL(propertyDestroyed(QtProperty *)),
    1254                 q_ptr, SLOT(slotPropertyDestroyed(QtProperty *)));
    1255         q_ptr->connect(manager, SIGNAL(propertyChanged(QtProperty *)),
    1256                 q_ptr, SLOT(slotPropertyDataChanged(QtProperty *)));
     1246                q_ptr, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
     1247        q_ptr->connect(manager, SIGNAL(propertyDestroyed(QtProperty*)),
     1248                q_ptr, SLOT(slotPropertyDestroyed(QtProperty*)));
     1249        q_ptr->connect(manager, SIGNAL(propertyChanged(QtProperty*)),
     1250                q_ptr, SLOT(slotPropertyDataChanged(QtProperty*)));
    12571251    }
    12581252    m_managerToProperties[manager].append(property);
    … …  
    12901284        q_ptr->disconnect(manager, SIGNAL(propertyRemoved(QtProperty *,
    12911285                            QtProperty *)),
    1292                 q_ptr, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
    1293         q_ptr->disconnect(manager, SIGNAL(propertyDestroyed(QtProperty *)),
    1294                 q_ptr, SLOT(slotPropertyDestroyed(QtProperty *)));
    1295         q_ptr->disconnect(manager, SIGNAL(propertyChanged(QtProperty *)),
    1296                 q_ptr, SLOT(slotPropertyDataChanged(QtProperty *)));
     1286                q_ptr, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
     1287        q_ptr->disconnect(manager, SIGNAL(propertyDestroyed(QtProperty*)),
     1288                q_ptr, SLOT(slotPropertyDestroyed(QtProperty*)));
     1289        q_ptr->disconnect(manager, SIGNAL(propertyChanged(QtProperty*)),
     1290                q_ptr, SLOT(slotPropertyDataChanged(QtProperty*)));
    12971291
    12981292        m_managerToProperties.remove(manager);
    … …  
    16491643*/
    16501644QtAbstractPropertyBrowser::QtAbstractPropertyBrowser(QWidget *parent)
    1651     : QWidget(parent)
    1652 {
    1653     d_ptr = new QtAbstractPropertyBrowserPrivate;
     1645    : QWidget(parent), d_ptr(new QtAbstractPropertyBrowserPrivate)
     1646{
    16541647    d_ptr->q_ptr = this;
    16551648
    … …  
    16741667    while (itItem.hasNext())
    16751668        d_ptr->clearIndex(itItem.next());
    1676     delete d_ptr;
    16771669}
    16781670
    … …  
    19591951}
    19601952
    1961 #if QT_VERSION >= 0x040400
    19621953QT_END_NAMESPACE
    1963 #endif
    19641954
    19651955#include "moc_qtpropertybrowser.cpp"

  • trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4646#include <QtCore/QSet>
    4747
    48 #if QT_VERSION >= 0x040400
    4948QT_BEGIN_NAMESPACE
    50 #endif
    51 
    52 
    5349
    5450class QtAbstractPropertyManager;
    … …  
    9086private:
    9187    friend class QtAbstractPropertyManager;
    92     QtPropertyPrivate *d_ptr;
     88    QScopedPointer<QtPropertyPrivate> d_ptr;
    9389};
    9490
    … …  
    123119private:
    124120    friend class QtProperty;
    125     QtAbstractPropertyManagerPrivate *d_ptr;
     121    QScopedPointer<QtAbstractPropertyManagerPrivate> d_ptr;
    126122    Q_DECLARE_PRIVATE(QtAbstractPropertyManager)
    127123    Q_DISABLE_COPY(QtAbstractPropertyManager)
    … …  
    240236    explicit QtBrowserItem(QtAbstractPropertyBrowser *browser, QtProperty *property, QtBrowserItem *parent);
    241237    ~QtBrowserItem();
    242     QtBrowserItemPrivate *d_ptr;
     238    QScopedPointer<QtBrowserItemPrivate> d_ptr;
    243239    friend class QtAbstractPropertyBrowserPrivate;
    244240};
    … …  
    297293                QtAbstractEditorFactoryBase *abstractFactory);
    298294
    299     QtAbstractPropertyBrowserPrivate *d_ptr;
     295    QScopedPointer<QtAbstractPropertyBrowserPrivate> d_ptr;
    300296    Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser)
    301297    Q_DISABLE_COPY(QtAbstractPropertyBrowser)
    … …  
    309305};
    310306
    311 #if QT_VERSION >= 0x040400
    312307QT_END_NAMESPACE
    313 #endif
    314308
    315309#endif // QTPROPERTYBROWSER_H

  • trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4949#include <QtGui/QMenu>
    5050
    51 #if QT_VERSION >= 0x040400
    5251QT_BEGIN_NAMESPACE
    53 #endif
    5452
    5553QtCursorDatabase::QtCursorDatabase()
    … …  
    427425}
    428426
    429 
    430 
    431 
    432 #if QT_VERSION >= 0x040400
    433427QT_END_NAMESPACE
    434 #endif

  • trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5959#include <QtCore/QStringList>
    6060
    61 #if QT_VERSION >= 0x040400
    6261QT_BEGIN_NAMESPACE
    63 #endif
    6462
    6563class QMouseEvent;
    … …  
    155153};
    156154
    157 #if QT_VERSION >= 0x040400
    158155QT_END_NAMESPACE
    159 #endif
    160156
    161157#endif

  • trunk/tools/shared/qtpropertybrowser/qtpropertymanager.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    6262#endif
    6363
    64 #if QT_VERSION >= 0x040400
    6564QT_BEGIN_NAMESPACE
    66 #endif
    6765
    6866template <class PrivateData, class Value>
    … …  
    422420};
    423421
    424 #if QT_VERSION < 0x040300
    425 
    426 static QList<QLocale::Country> countriesForLanguage(QLocale::Language language)
    427 {
    428     QList<QLocale::Country> countries;
    429     QLocale::Country country = QLocale::AnyCountry;
    430     while (country <= QLocale::LastCountry) {
    431         QLocale locale(language, country);
    432         if (locale.language() == language && !countries.contains(locale.country()))
    433             countries << locale.country();
    434         country = (QLocale::Country)((uint)country + 1); // ++country
    435     }
    436     return countries;
    437 }
    438 
    439 #endif
    440 
    441422static QList<QLocale::Country> sortCountries(const QList<QLocale::Country> &countries)
    442423{
    … …  
    470451        QLocale::Language language = itLang.next();
    471452        QList<QLocale::Country> countries;
    472 #if QT_VERSION < 0x040300
    473         countries = countriesForLanguage(language);
    474 #else
    475453        countries = QLocale::countriesForLanguage(language);
    476 #endif
    477454        if (countries.isEmpty() && language == system.language())
    478455            countries << system.country();
    … …  
    701678*/
    702679QtIntPropertyManager::QtIntPropertyManager(QObject *parent)
    703     : QtAbstractPropertyManager(parent)
    704 {
    705     d_ptr = new QtIntPropertyManagerPrivate;
     680    : QtAbstractPropertyManager(parent), d_ptr(new QtIntPropertyManagerPrivate)
     681{
    706682    d_ptr->q_ptr = this;
    707683}
    … …  
    713689{
    714690    clear();
    715     delete d_ptr;
    716691}
    717692
    … …  
    786761{
    787762    void (QtIntPropertyManagerPrivate::*setSubPropertyValue)(QtProperty *, int) = 0;
    788     setValueInRange<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int>(this, d_ptr,
     763    setValueInRange<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int>(this, d_ptr.data(),
    789764                &QtIntPropertyManager::propertyChanged,
    790765                &QtIntPropertyManager::valueChanged,
    … …  
    803778void QtIntPropertyManager::setMinimum(QtProperty *property, int minVal)
    804779{
    805     setMinimumValue<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int, QtIntPropertyManagerPrivate::Data>(this, d_ptr,
     780    setMinimumValue<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int, QtIntPropertyManagerPrivate::Data>(this, d_ptr.data(),
    806781                &QtIntPropertyManager::propertyChanged,
    807782                &QtIntPropertyManager::valueChanged,
    … …  
    821796void QtIntPropertyManager::setMaximum(QtProperty *property, int maxVal)
    822797{
    823     setMaximumValue<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int, QtIntPropertyManagerPrivate::Data>(this, d_ptr,
     798    setMaximumValue<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int, QtIntPropertyManagerPrivate::Data>(this, d_ptr.data(),
    824799                &QtIntPropertyManager::propertyChanged,
    825800                &QtIntPropertyManager::valueChanged,
    … …  
    845820{
    846821    void (QtIntPropertyManagerPrivate::*setSubPropertyRange)(QtProperty *, int, int, int) = 0;
    847     setBorderValues<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int>(this, d_ptr,
     822    setBorderValues<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int>(this, d_ptr.data(),
    848823                &QtIntPropertyManager::propertyChanged,
    849824                &QtIntPropertyManager::valueChanged,
    … …  
    992967*/
    993968QtDoublePropertyManager::QtDoublePropertyManager(QObject *parent)
    994     : QtAbstractPropertyManager(parent)
    995 {
    996     d_ptr = new QtDoublePropertyManagerPrivate;
     969    : QtAbstractPropertyManager(parent), d_ptr(new QtDoublePropertyManagerPrivate)
     970{
    997971    d_ptr->q_ptr = this;
    998972}
    … …  
    1004978{
    1005979    clear();
    1006     delete d_ptr;
    1007980}
    1008981
    … …  
    10871060{
    10881061    void (QtDoublePropertyManagerPrivate::*setSubPropertyValue)(QtProperty *, double) = 0;
    1089     setValueInRange<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double>(this, d_ptr,
     1062    setValueInRange<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double>(this, d_ptr.data(),
    10901063                &QtDoublePropertyManager::propertyChanged,
    10911064                &QtDoublePropertyManager::valueChanged,
    … …  
    11641137void QtDoublePropertyManager::setMinimum(QtProperty *property, double minVal)
    11651138{
    1166     setMinimumValue<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double, QtDoublePropertyManagerPrivate::Data>(this, d_ptr,
     1139    setMinimumValue<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double, QtDoublePropertyManagerPrivate::Data>(this, d_ptr.data(),
    11671140                &QtDoublePropertyManager::propertyChanged,
    11681141                &QtDoublePropertyManager::valueChanged,
    … …  
    11821155void QtDoublePropertyManager::setMaximum(QtProperty *property, double maxVal)
    11831156{
    1184     setMaximumValue<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double, QtDoublePropertyManagerPrivate::Data>(this, d_ptr,
     1157    setMaximumValue<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double, QtDoublePropertyManagerPrivate::Data>(this, d_ptr.data(),
    11851158                &QtDoublePropertyManager::propertyChanged,
    11861159                &QtDoublePropertyManager::valueChanged,
    … …  
    12061179{
    12071180    void (QtDoublePropertyManagerPrivate::*setSubPropertyRange)(QtProperty *, double, double, double) = 0;
    1208     setBorderValues<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double>(this, d_ptr,
     1181    setBorderValues<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double>(this, d_ptr.data(),
    12091182                &QtDoublePropertyManager::propertyChanged,
    12101183                &QtDoublePropertyManager::valueChanged,
    … …  
    12971270*/
    12981271QtStringPropertyManager::QtStringPropertyManager(QObject *parent)
    1299     : QtAbstractPropertyManager(parent)
    1300 {
    1301     d_ptr = new QtStringPropertyManagerPrivate;
     1272    : QtAbstractPropertyManager(parent), d_ptr(new QtStringPropertyManagerPrivate)
     1273{
    13021274    d_ptr->q_ptr = this;
    13031275}
    … …  
    13091281{
    13101282    clear();
    1311     delete d_ptr;
    13121283}
    13131284
    … …  
    14611432*/
    14621433QtBoolPropertyManager::QtBoolPropertyManager(QObject *parent)
    1463     : QtAbstractPropertyManager(parent)
    1464 {
    1465     d_ptr = new QtBoolPropertyManagerPrivate;
     1434    : QtAbstractPropertyManager(parent), d_ptr(new QtBoolPropertyManagerPrivate)
     1435{
    14661436    d_ptr->q_ptr = this;
    14671437}
    … …  
    14731443{
    14741444    clear();
    1475     delete d_ptr;
    14761445}
    14771446
    … …  
    16541623*/
    16551624QtDatePropertyManager::QtDatePropertyManager(QObject *parent)
    1656     : QtAbstractPropertyManager(parent)
    1657 {
    1658     d_ptr = new QtDatePropertyManagerPrivate;
     1625    : QtAbstractPropertyManager(parent), d_ptr(new QtDatePropertyManagerPrivate)
     1626{
    16591627    d_ptr->q_ptr = this;
    16601628
    … …  
    16691637{
    16701638    clear();
    1671     delete d_ptr;
    16721639}
    16731640
    … …  
    17301697{
    17311698    void (QtDatePropertyManagerPrivate::*setSubPropertyValue)(QtProperty *, const QDate &) = 0;
    1732     setValueInRange<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, const QDate>(this, d_ptr,
     1699    setValueInRange<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, const QDate>(this, d_ptr.data(),
    17331700                &QtDatePropertyManager::propertyChanged,
    17341701                &QtDatePropertyManager::valueChanged,
    … …  
    17471714void QtDatePropertyManager::setMinimum(QtProperty *property, const QDate &minVal)
    17481715{
    1749     setMinimumValue<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate, QtDatePropertyManagerPrivate::Data>(this, d_ptr,
     1716    setMinimumValue<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate, QtDatePropertyManagerPrivate::Data>(this, d_ptr.data(),
    17501717                &QtDatePropertyManager::propertyChanged,
    17511718                &QtDatePropertyManager::valueChanged,
    … …  
    17651732void QtDatePropertyManager::setMaximum(QtProperty *property, const QDate &maxVal)
    17661733{
    1767     setMaximumValue<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate, QtDatePropertyManagerPrivate::Data>(this, d_ptr,
     1734    setMaximumValue<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate, QtDatePropertyManagerPrivate::Data>(this, d_ptr.data(),
    17681735                &QtDatePropertyManager::propertyChanged,
    17691736                &QtDatePropertyManager::valueChanged,
    … …  
    17901757    void (QtDatePropertyManagerPrivate::*setSubPropertyRange)(QtProperty *, const QDate &,
    17911758          const QDate &, const QDate &) = 0;
    1792     setBorderValues<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate>(this, d_ptr,
     1759    setBorderValues<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate>(this, d_ptr.data(),
    17931760                &QtDatePropertyManager::propertyChanged,
    17941761                &QtDatePropertyManager::valueChanged,
    … …  
    18591826*/
    18601827QtTimePropertyManager::QtTimePropertyManager(QObject *parent)
    1861     : QtAbstractPropertyManager(parent)
    1862 {
    1863     d_ptr = new QtTimePropertyManagerPrivate;
     1828    : QtAbstractPropertyManager(parent), d_ptr(new QtTimePropertyManagerPrivate)
     1829{
    18641830    d_ptr->q_ptr = this;
    18651831
    … …  
    18741840{
    18751841    clear();
    1876     delete d_ptr;
    18771842}
    18781843
    … …  
    19741939*/
    19751940QtDateTimePropertyManager::QtDateTimePropertyManager(QObject *parent)
    1976     : QtAbstractPropertyManager(parent)
    1977 {
    1978     d_ptr = new QtDateTimePropertyManagerPrivate;
     1941    : QtAbstractPropertyManager(parent), d_ptr(new QtDateTimePropertyManagerPrivate)
     1942{
    19791943    d_ptr->q_ptr = this;
    19801944
    … …  
    19911955{
    19921956    clear();
    1993     delete d_ptr;
    19941957}
    19951958
    … …  
    20922055*/
    20932056QtKeySequencePropertyManager::QtKeySequencePropertyManager(QObject *parent)
    2094     : QtAbstractPropertyManager(parent)
    2095 {
    2096     d_ptr = new QtKeySequencePropertyManagerPrivate;
     2057    : QtAbstractPropertyManager(parent), d_ptr(new QtKeySequencePropertyManagerPrivate)
     2058{
    20972059    d_ptr->q_ptr = this;
    20982060}
    … …  
    21042066{
    21052067    clear();
    2106     delete d_ptr;
    21072068}
    21082069
    … …  
    22032164*/
    22042165QtCharPropertyManager::QtCharPropertyManager(QObject *parent)
    2205     : QtAbstractPropertyManager(parent)
    2206 {
    2207     d_ptr = new QtCharPropertyManagerPrivate;
     2166    : QtAbstractPropertyManager(parent), d_ptr(new QtCharPropertyManagerPrivate)
     2167{
    22082168    d_ptr->q_ptr = this;
    22092169}
    … …  
    22152175{
    22162176    clear();
    2217     delete d_ptr;
    22182177}
    22192178
    … …  
    23712330*/
    23722331QtLocalePropertyManager::QtLocalePropertyManager(QObject *parent)
    2373     : QtAbstractPropertyManager(parent)
    2374 {
    2375     d_ptr = new QtLocalePropertyManagerPrivate;
     2332    : QtAbstractPropertyManager(parent), d_ptr(new QtLocalePropertyManagerPrivate)
     2333{
    23762334    d_ptr->q_ptr = this;
    23772335
    23782336    d_ptr->m_enumPropertyManager = new QtEnumPropertyManager(this);
    2379     connect(d_ptr->m_enumPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    2380                 this, SLOT(slotEnumChanged(QtProperty *, int)));
    2381 
    2382     connect(d_ptr->m_enumPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    2383                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     2337    connect(d_ptr->m_enumPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     2338                this, SLOT(slotEnumChanged(QtProperty*,int)));
     2339
     2340    connect(d_ptr->m_enumPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     2341                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    23842342}
    23852343
    … …  
    23902348{
    23912349    clear();
    2392     delete d_ptr;
    23932350}
    23942351
    … …  
    26102567*/
    26112568QtPointPropertyManager::QtPointPropertyManager(QObject *parent)
    2612     : QtAbstractPropertyManager(parent)
    2613 {
    2614     d_ptr = new QtPointPropertyManagerPrivate;
     2569    : QtAbstractPropertyManager(parent), d_ptr(new QtPointPropertyManagerPrivate)
     2570{
    26152571    d_ptr->q_ptr = this;
    26162572
    26172573    d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
    2618     connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    2619                 this, SLOT(slotIntChanged(QtProperty *, int)));
    2620     connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    2621                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     2574    connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     2575                this, SLOT(slotIntChanged(QtProperty*,int)));
     2576    connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     2577                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    26222578}
    26232579
    … …  
    26282584{
    26292585    clear();
    2630     delete d_ptr;
    26312586}
    26322587
    … …  
    28422797*/
    28432798QtPointFPropertyManager::QtPointFPropertyManager(QObject *parent)
    2844     : QtAbstractPropertyManager(parent)
    2845 {
    2846     d_ptr = new QtPointFPropertyManagerPrivate;
     2799    : QtAbstractPropertyManager(parent), d_ptr(new QtPointFPropertyManagerPrivate)
     2800{
    28472801    d_ptr->q_ptr = this;
    28482802
    28492803    d_ptr->m_doublePropertyManager = new QtDoublePropertyManager(this);
    2850     connect(d_ptr->m_doublePropertyManager, SIGNAL(valueChanged(QtProperty *, double)),
    2851                 this, SLOT(slotDoubleChanged(QtProperty *, double)));
    2852     connect(d_ptr->m_doublePropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    2853                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     2804    connect(d_ptr->m_doublePropertyManager, SIGNAL(valueChanged(QtProperty*,double)),
     2805                this, SLOT(slotDoubleChanged(QtProperty*,double)));
     2806    connect(d_ptr->m_doublePropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     2807                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    28542808}
    28552809
    … …  
    28602814{
    28612815    clear();
    2862     delete d_ptr;
    28632816}
    28642817
    … …  
    31553108*/
    31563109QtSizePropertyManager::QtSizePropertyManager(QObject *parent)
    3157     : QtAbstractPropertyManager(parent)
    3158 {
    3159     d_ptr = new QtSizePropertyManagerPrivate;
     3110    : QtAbstractPropertyManager(parent), d_ptr(new QtSizePropertyManagerPrivate)
     3111{
    31603112    d_ptr->q_ptr = this;
    31613113
    31623114    d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
    3163     connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    3164                 this, SLOT(slotIntChanged(QtProperty *, int)));
    3165     connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    3166                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     3115    connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     3116                this, SLOT(slotIntChanged(QtProperty*,int)));
     3117    connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     3118                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    31673119}
    31683120
    … …  
    31733125{
    31743126    clear();
    3175     delete d_ptr;
    31763127}
    31773128
    … …  
    32503201void QtSizePropertyManager::setValue(QtProperty *property, const QSize &val)
    32513202{
    3252     setValueInRange<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, const QSize>(this, d_ptr,
     3203    setValueInRange<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, const QSize>(this, d_ptr.data(),
    32533204                &QtSizePropertyManager::propertyChanged,
    32543205                &QtSizePropertyManager::valueChanged,
    … …  
    32673218void QtSizePropertyManager::setMinimum(QtProperty *property, const QSize &minVal)
    32683219{
    3269     setBorderValue<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize, QtSizePropertyManagerPrivate::Data>(this, d_ptr,
     3220    setBorderValue<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize, QtSizePropertyManagerPrivate::Data>(this, d_ptr.data(),
    32703221                &QtSizePropertyManager::propertyChanged,
    32713222                &QtSizePropertyManager::valueChanged,
    … …  
    32883239void QtSizePropertyManager::setMaximum(QtProperty *property, const QSize &maxVal)
    32893240{
    3290     setBorderValue<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize, QtSizePropertyManagerPrivate::Data>(this, d_ptr,
     3241    setBorderValue<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize, QtSizePropertyManagerPrivate::Data>(this, d_ptr.data(),
    32913242                &QtSizePropertyManager::propertyChanged,
    32923243                &QtSizePropertyManager::valueChanged,
    … …  
    33143265void QtSizePropertyManager::setRange(QtProperty *property, const QSize &minVal, const QSize &maxVal)
    33153266{
    3316     setBorderValues<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize>(this, d_ptr,
     3267    setBorderValues<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize>(this, d_ptr.data(),
    33173268                &QtSizePropertyManager::propertyChanged,
    33183269                &QtSizePropertyManager::valueChanged,
    … …  
    35113462*/
    35123463QtSizeFPropertyManager::QtSizeFPropertyManager(QObject *parent)
    3513     : QtAbstractPropertyManager(parent)
    3514 {
    3515     d_ptr = new QtSizeFPropertyManagerPrivate;
     3464    : QtAbstractPropertyManager(parent), d_ptr(new QtSizeFPropertyManagerPrivate)
     3465{
    35163466    d_ptr->q_ptr = this;
    35173467
    35183468    d_ptr->m_doublePropertyManager = new QtDoublePropertyManager(this);
    3519     connect(d_ptr->m_doublePropertyManager, SIGNAL(valueChanged(QtProperty *, double)),
    3520                 this, SLOT(slotDoubleChanged(QtProperty *, double)));
    3521     connect(d_ptr->m_doublePropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    3522                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     3469    connect(d_ptr->m_doublePropertyManager, SIGNAL(valueChanged(QtProperty*,double)),
     3470                this, SLOT(slotDoubleChanged(QtProperty*,double)));
     3471    connect(d_ptr->m_doublePropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     3472                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    35233473}
    35243474
    … …  
    35293479{
    35303480    clear();
    3531     delete d_ptr;
    35323481}
    35333482
    … …  
    36173566void QtSizeFPropertyManager::setValue(QtProperty *property, const QSizeF &val)
    36183567{
    3619     setValueInRange<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF>(this, d_ptr,
     3568    setValueInRange<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF>(this, d_ptr.data(),
    36203569                &QtSizeFPropertyManager::propertyChanged,
    36213570                &QtSizeFPropertyManager::valueChanged,
    … …  
    36683617void QtSizeFPropertyManager::setMinimum(QtProperty *property, const QSizeF &minVal)
    36693618{
    3670     setBorderValue<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF, QtSizeFPropertyManagerPrivate::Data>(this, d_ptr,
     3619    setBorderValue<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF, QtSizeFPropertyManagerPrivate::Data>(this, d_ptr.data(),
    36713620                &QtSizeFPropertyManager::propertyChanged,
    36723621                &QtSizeFPropertyManager::valueChanged,
    … …  
    36893638void QtSizeFPropertyManager::setMaximum(QtProperty *property, const QSizeF &maxVal)
    36903639{
    3691     setBorderValue<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF, QtSizeFPropertyManagerPrivate::Data>(this, d_ptr,
     3640    setBorderValue<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF, QtSizeFPropertyManagerPrivate::Data>(this, d_ptr.data(),
    36923641                &QtSizeFPropertyManager::propertyChanged,
    36933642                &QtSizeFPropertyManager::valueChanged,
    … …  
    37153664void QtSizeFPropertyManager::setRange(QtProperty *property, const QSizeF &minVal, const QSizeF &maxVal)
    37163665{
    3717     setBorderValues<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF>(this, d_ptr,
     3666    setBorderValues<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF>(this, d_ptr.data(),
    37183667                &QtSizeFPropertyManager::propertyChanged,
    37193668                &QtSizeFPropertyManager::valueChanged,
    … …  
    39273876*/
    39283877QtRectPropertyManager::QtRectPropertyManager(QObject *parent)
    3929     : QtAbstractPropertyManager(parent)
    3930 {
    3931     d_ptr = new QtRectPropertyManagerPrivate;
     3878    : QtAbstractPropertyManager(parent), d_ptr(new QtRectPropertyManagerPrivate)
     3879{
    39323880    d_ptr->q_ptr = this;
    39333881
    39343882    d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
    3935     connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    3936                 this, SLOT(slotIntChanged(QtProperty *, int)));
    3937     connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    3938                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     3883    connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     3884                this, SLOT(slotIntChanged(QtProperty*,int)));
     3885    connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     3886                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    39393887}
    39403888
    … …  
    39453893{
    39463894    clear();
    3947     delete d_ptr;
    39483895}
    39493896
    … …  
    43494296*/
    43504297QtRectFPropertyManager::QtRectFPropertyManager(QObject *parent)
    4351     : QtAbstractPropertyManager(parent)
    4352 {
    4353     d_ptr = new QtRectFPropertyManagerPrivate;
     4298    : QtAbstractPropertyManager(parent), d_ptr(new QtRectFPropertyManagerPrivate)
     4299{
    43544300    d_ptr->q_ptr = this;
    43554301
    43564302    d_ptr->m_doublePropertyManager = new QtDoublePropertyManager(this);
    4357     connect(d_ptr->m_doublePropertyManager, SIGNAL(valueChanged(QtProperty *, double)),
    4358                 this, SLOT(slotDoubleChanged(QtProperty *, double)));
    4359     connect(d_ptr->m_doublePropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    4360                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     4303    connect(d_ptr->m_doublePropertyManager, SIGNAL(valueChanged(QtProperty*,double)),
     4304                this, SLOT(slotDoubleChanged(QtProperty*,double)));
     4305    connect(d_ptr->m_doublePropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     4306                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    43614307}
    43624308
    … …  
    43674313{
    43684314    clear();
    4369     delete d_ptr;
    43704315}
    43714316
    … …  
    47344679*/
    47354680QtEnumPropertyManager::QtEnumPropertyManager(QObject *parent)
    4736     : QtAbstractPropertyManager(parent)
    4737 {
    4738     d_ptr = new QtEnumPropertyManagerPrivate;
     4681    : QtAbstractPropertyManager(parent), d_ptr(new QtEnumPropertyManagerPrivate)
     4682{
    47394683    d_ptr->q_ptr = this;
    47404684}
    … …  
    47464690{
    47474691    clear();
    4748     delete d_ptr;
    47494692}
    47504693
    … …  
    50464989*/
    50474990QtFlagPropertyManager::QtFlagPropertyManager(QObject *parent)
    5048     : QtAbstractPropertyManager(parent)
    5049 {
    5050     d_ptr = new QtFlagPropertyManagerPrivate;
     4991    : QtAbstractPropertyManager(parent), d_ptr(new QtFlagPropertyManagerPrivate)
     4992{
    50514993    d_ptr->q_ptr = this;
    50524994
    50534995    d_ptr->m_boolPropertyManager = new QtBoolPropertyManager(this);
    5054     connect(d_ptr->m_boolPropertyManager, SIGNAL(valueChanged(QtProperty *, bool)),
    5055                 this, SLOT(slotBoolChanged(QtProperty *, bool)));
    5056     connect(d_ptr->m_boolPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    5057                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     4996    connect(d_ptr->m_boolPropertyManager, SIGNAL(valueChanged(QtProperty*,bool)),
     4997                this, SLOT(slotBoolChanged(QtProperty*,bool)));
     4998    connect(d_ptr->m_boolPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     4999                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    50585000}
    50595001
    … …  
    50645006{
    50655007    clear();
    5066     delete d_ptr;
    50675008}
    50685009
    … …  
    53745315*/
    53755316QtSizePolicyPropertyManager::QtSizePolicyPropertyManager(QObject *parent)
    5376     : QtAbstractPropertyManager(parent)
    5377 {
    5378     d_ptr = new QtSizePolicyPropertyManagerPrivate;
     5317    : QtAbstractPropertyManager(parent), d_ptr(new QtSizePolicyPropertyManagerPrivate)
     5318{
    53795319    d_ptr->q_ptr = this;
    53805320
    53815321    d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
    5382     connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    5383                 this, SLOT(slotIntChanged(QtProperty *, int)));
     5322    connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     5323                this, SLOT(slotIntChanged(QtProperty*,int)));
    53845324    d_ptr->m_enumPropertyManager = new QtEnumPropertyManager(this);
    5385     connect(d_ptr->m_enumPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    5386                 this, SLOT(slotEnumChanged(QtProperty *, int)));
    5387 
    5388     connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    5389                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
    5390     connect(d_ptr->m_enumPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    5391                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     5325    connect(d_ptr->m_enumPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     5326                this, SLOT(slotEnumChanged(QtProperty*,int)));
     5327
     5328    connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     5329                this, SLOT(slotPropertyDestroyed(QtProperty*)));
     5330    connect(d_ptr->m_enumPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     5331                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    53925332}
    53935333
    … …  
    53985338{
    53995339    clear();
    5400     delete d_ptr;
    54015340}
    54025341
    … …  
    57865725*/
    57875726QtFontPropertyManager::QtFontPropertyManager(QObject *parent)
    5788     : QtAbstractPropertyManager(parent)
    5789 {
    5790     d_ptr = new QtFontPropertyManagerPrivate;
     5727    : QtAbstractPropertyManager(parent), d_ptr(new QtFontPropertyManagerPrivate)
     5728{
    57915729    d_ptr->q_ptr = this;
    5792 #if QT_VERSION >= 0x040500
    57935730    QObject::connect(qApp, SIGNAL(fontDatabaseChanged()), this, SLOT(slotFontDatabaseChanged()));
    5794 #endif
    57955731
    57965732    d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
    5797     connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    5798                 this, SLOT(slotIntChanged(QtProperty *, int)));
     5733    connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     5734                this, SLOT(slotIntChanged(QtProperty*,int)));
    57995735    d_ptr->m_enumPropertyManager = new QtEnumPropertyManager(this);
    5800     connect(d_ptr->m_enumPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    5801                 this, SLOT(slotEnumChanged(QtProperty *, int)));
     5736    connect(d_ptr->m_enumPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     5737                this, SLOT(slotEnumChanged(QtProperty*,int)));
    58025738    d_ptr->m_boolPropertyManager = new QtBoolPropertyManager(this);
    5803     connect(d_ptr->m_boolPropertyManager, SIGNAL(valueChanged(QtProperty *, bool)),
    5804                 this, SLOT(slotBoolChanged(QtProperty *, bool)));
    5805 
    5806     connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    5807                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
    5808     connect(d_ptr->m_enumPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    5809                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
    5810     connect(d_ptr->m_boolPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    5811                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     5739    connect(d_ptr->m_boolPropertyManager, SIGNAL(valueChanged(QtProperty*,bool)),
     5740                this, SLOT(slotBoolChanged(QtProperty*,bool)));
     5741
     5742    connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     5743                this, SLOT(slotPropertyDestroyed(QtProperty*)));
     5744    connect(d_ptr->m_enumPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     5745                this, SLOT(slotPropertyDestroyed(QtProperty*)));
     5746    connect(d_ptr->m_boolPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     5747                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    58125748}
    58135749
    … …  
    58185754{
    58195755    clear();
    5820     delete d_ptr;
    58215756}
    58225757
    … …  
    61666101*/
    61676102QtColorPropertyManager::QtColorPropertyManager(QObject *parent)
    6168     : QtAbstractPropertyManager(parent)
    6169 {
    6170     d_ptr = new QtColorPropertyManagerPrivate;
     6103    : QtAbstractPropertyManager(parent), d_ptr(new QtColorPropertyManagerPrivate)
     6104{
    61716105    d_ptr->q_ptr = this;
    61726106
    61736107    d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
    6174     connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    6175                 this, SLOT(slotIntChanged(QtProperty *, int)));
    6176 
    6177     connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty *)),
    6178                 this, SLOT(slotPropertyDestroyed(QtProperty *)));
     6108    connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     6109                this, SLOT(slotIntChanged(QtProperty*,int)));
     6110
     6111    connect(d_ptr->m_intPropertyManager, SIGNAL(propertyDestroyed(QtProperty*)),
     6112                this, SLOT(slotPropertyDestroyed(QtProperty*)));
    61796113}
    61806114
    … …  
    61856119{
    61866120    clear();
    6187     delete d_ptr;
    61886121}
    61896122
    … …  
    63906323*/
    63916324QtCursorPropertyManager::QtCursorPropertyManager(QObject *parent)
    6392     : QtAbstractPropertyManager(parent)
    6393 {
    6394     d_ptr = new QtCursorPropertyManagerPrivate;
     6325    : QtAbstractPropertyManager(parent), d_ptr(new QtCursorPropertyManagerPrivate)
     6326{
    63956327    d_ptr->q_ptr = this;
    63966328}
    … …  
    64026334{
    64036335    clear();
    6404     delete d_ptr;
    64056336}
    64066337
    … …  
    64866417}
    64876418
    6488 #if QT_VERSION >= 0x040400
    64896419QT_END_NAMESPACE
    6490 #endif
    64916420
    64926421#include "moc_qtpropertymanager.cpp"

  • trunk/tools/shared/qtpropertybrowser/qtpropertymanager.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4545#include "qtpropertybrowser.h"
    4646
    47 #if QT_VERSION >= 0x040400
    4847QT_BEGIN_NAMESPACE
    49 #endif
    5048
    5149class QDate;
    … …  
    9795    virtual void uninitializeProperty(QtProperty *property);
    9896private:
    99     QtIntPropertyManagerPrivate *d_ptr;
     97    QScopedPointer<QtIntPropertyManagerPrivate> d_ptr;
    10098    Q_DECLARE_PRIVATE(QtIntPropertyManager)
    10199    Q_DISABLE_COPY(QtIntPropertyManager)
    … …  
    123121    virtual void uninitializeProperty(QtProperty *property);
    124122private:
    125     QtBoolPropertyManagerPrivate *d_ptr;
     123    QScopedPointer<QtBoolPropertyManagerPrivate> d_ptr;
    126124    Q_DECLARE_PRIVATE(QtBoolPropertyManager)
    127125    Q_DISABLE_COPY(QtBoolPropertyManager)
    … …  
    160158    virtual void uninitializeProperty(QtProperty *property);
    161159private:
    162     QtDoublePropertyManagerPrivate *d_ptr;
     160    QScopedPointer<QtDoublePropertyManagerPrivate> d_ptr;
    163161    Q_DECLARE_PRIVATE(QtDoublePropertyManager)
    164162    Q_DISABLE_COPY(QtDoublePropertyManager)
    … …  
    188186    virtual void uninitializeProperty(QtProperty *property);
    189187private:
    190     QtStringPropertyManagerPrivate *d_ptr;
     188    QScopedPointer<QtStringPropertyManagerPrivate> d_ptr;
    191189    Q_DECLARE_PRIVATE(QtStringPropertyManager)
    192190    Q_DISABLE_COPY(QtStringPropertyManager)
    … …  
    219217    virtual void uninitializeProperty(QtProperty *property);
    220218private:
    221     QtDatePropertyManagerPrivate *d_ptr;
     219    QScopedPointer<QtDatePropertyManagerPrivate> d_ptr;
    222220    Q_DECLARE_PRIVATE(QtDatePropertyManager)
    223221    Q_DISABLE_COPY(QtDatePropertyManager)
    … …  
    244242    virtual void uninitializeProperty(QtProperty *property);
    245243private:
    246     QtTimePropertyManagerPrivate *d_ptr;
     244    QScopedPointer<QtTimePropertyManagerPrivate> d_ptr;
    247245    Q_DECLARE_PRIVATE(QtTimePropertyManager)
    248246    Q_DISABLE_COPY(QtTimePropertyManager)
    … …  
    269267    virtual void uninitializeProperty(QtProperty *property);
    270268private:
    271     QtDateTimePropertyManagerPrivate *d_ptr;
     269    QScopedPointer<QtDateTimePropertyManagerPrivate> d_ptr;
    272270    Q_DECLARE_PRIVATE(QtDateTimePropertyManager)
    273271    Q_DISABLE_COPY(QtDateTimePropertyManager)
    … …  
    294292    virtual void uninitializeProperty(QtProperty *property);
    295293private:
    296     QtKeySequencePropertyManagerPrivate *d_ptr;
     294    QScopedPointer<QtKeySequencePropertyManagerPrivate> d_ptr;
    297295    Q_DECLARE_PRIVATE(QtKeySequencePropertyManager)
    298296    Q_DISABLE_COPY(QtKeySequencePropertyManager)
    … …  
    319317    virtual void uninitializeProperty(QtProperty *property);
    320318private:
    321     QtCharPropertyManagerPrivate *d_ptr;
     319    QScopedPointer<QtCharPropertyManagerPrivate> d_ptr;
    322320    Q_DECLARE_PRIVATE(QtCharPropertyManager)
    323321    Q_DISABLE_COPY(QtCharPropertyManager)
    … …  
    347345    virtual void uninitializeProperty(QtProperty *property);
    348346private:
    349     QtLocalePropertyManagerPrivate *d_ptr;
     347    QScopedPointer<QtLocalePropertyManagerPrivate> d_ptr;
    350348    Q_DECLARE_PRIVATE(QtLocalePropertyManager)
    351349    Q_DISABLE_COPY(QtLocalePropertyManager)
    … …  
    376374    virtual void uninitializeProperty(QtProperty *property);
    377375private:
    378     QtPointPropertyManagerPrivate *d_ptr;
     376    QScopedPointer<QtPointPropertyManagerPrivate> d_ptr;
    379377    Q_DECLARE_PRIVATE(QtPointPropertyManager)
    380378    Q_DISABLE_COPY(QtPointPropertyManager)
    … …  
    408406    virtual void uninitializeProperty(QtProperty *property);
    409407private:
    410     QtPointFPropertyManagerPrivate *d_ptr;
     408    QScopedPointer<QtPointFPropertyManagerPrivate> d_ptr;
    411409    Q_DECLARE_PRIVATE(QtPointFPropertyManager)
    412410    Q_DISABLE_COPY(QtPointFPropertyManager)
    … …  
    443441    virtual void uninitializeProperty(QtProperty *property);
    444442private:
    445     QtSizePropertyManagerPrivate *d_ptr;
     443    QScopedPointer<QtSizePropertyManagerPrivate> d_ptr;
    446444    Q_DECLARE_PRIVATE(QtSizePropertyManager)
    447445    Q_DISABLE_COPY(QtSizePropertyManager)
    … …  
    481479    virtual void uninitializeProperty(QtProperty *property);
    482480private:
    483     QtSizeFPropertyManagerPrivate *d_ptr;
     481    QScopedPointer<QtSizeFPropertyManagerPrivate> d_ptr;
    484482    Q_DECLARE_PRIVATE(QtSizeFPropertyManager)
    485483    Q_DISABLE_COPY(QtSizeFPropertyManager)
    … …  
    513511    virtual void uninitializeProperty(QtProperty *property);
    514512private:
    515     QtRectPropertyManagerPrivate *d_ptr;
     513    QScopedPointer<QtRectPropertyManagerPrivate> d_ptr;
    516514    Q_DECLARE_PRIVATE(QtRectPropertyManager)
    517515    Q_DISABLE_COPY(QtRectPropertyManager)
    … …  
    548546    virtual void uninitializeProperty(QtProperty *property);
    549547private:
    550     QtRectFPropertyManagerPrivate *d_ptr;
     548    QScopedPointer<QtRectFPropertyManagerPrivate> d_ptr;
    551549    Q_DECLARE_PRIVATE(QtRectFPropertyManager)
    552550    Q_DISABLE_COPY(QtRectFPropertyManager)
    … …  
    582580    virtual void uninitializeProperty(QtProperty *property);
    583581private:
    584     QtEnumPropertyManagerPrivate *d_ptr;
     582    QScopedPointer<QtEnumPropertyManagerPrivate> d_ptr;
    585583    Q_DECLARE_PRIVATE(QtEnumPropertyManager)
    586584    Q_DISABLE_COPY(QtEnumPropertyManager)
    … …  
    612610    virtual void uninitializeProperty(QtProperty *property);
    613611private:
    614     QtFlagPropertyManagerPrivate *d_ptr;
     612    QScopedPointer<QtFlagPropertyManagerPrivate> d_ptr;
    615613    Q_DECLARE_PRIVATE(QtFlagPropertyManager)
    616614    Q_DISABLE_COPY(QtFlagPropertyManager)
    … …  
    642640    virtual void uninitializeProperty(QtProperty *property);
    643641private:
    644     QtSizePolicyPropertyManagerPrivate *d_ptr;
     642    QScopedPointer<QtSizePolicyPropertyManagerPrivate> d_ptr;
    645643    Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager)
    646644    Q_DISABLE_COPY(QtSizePolicyPropertyManager)
    … …  
    675673    virtual void uninitializeProperty(QtProperty *property);
    676674private:
    677     QtFontPropertyManagerPrivate *d_ptr;
     675    QScopedPointer<QtFontPropertyManagerPrivate> d_ptr;
    678676    Q_DECLARE_PRIVATE(QtFontPropertyManager)
    679677    Q_DISABLE_COPY(QtFontPropertyManager)
    … …  
    709707    virtual void uninitializeProperty(QtProperty *property);
    710708private:
    711     QtColorPropertyManagerPrivate *d_ptr;
     709    QScopedPointer<QtColorPropertyManagerPrivate> d_ptr;
    712710    Q_DECLARE_PRIVATE(QtColorPropertyManager)
    713711    Q_DISABLE_COPY(QtColorPropertyManager)
    … …  
    739737    virtual void uninitializeProperty(QtProperty *property);
    740738private:
    741     QtCursorPropertyManagerPrivate *d_ptr;
     739    QScopedPointer<QtCursorPropertyManagerPrivate> d_ptr;
    742740    Q_DECLARE_PRIVATE(QtCursorPropertyManager)
    743741    Q_DISABLE_COPY(QtCursorPropertyManager)
    744742};
    745743
    746 #if QT_VERSION >= 0x040400
    747744QT_END_NAMESPACE
     745
    748746#endif
    749 
    750 #endif

  • trunk/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5353#include <QtGui/QPalette>
    5454
    55 #if QT_VERSION >= 0x040400
    5655QT_BEGIN_NAMESPACE
    57 #endif
    5856
    5957class QtPropertyEditorView;
    … …  
    313311                editor->setAutoFillBackground(true);
    314312                editor->installEventFilter(const_cast<QtPropertyEditorDelegate *>(this));
    315                 connect(editor, SIGNAL(destroyed(QObject *)), this, SLOT(slotEditorDestroyed(QObject *)));
     313                connect(editor, SIGNAL(destroyed(QObject*)), this, SLOT(slotEditorDestroyed(QObject*)));
    316314                m_propertyToEditor[property] = editor;
    317315                m_editorToProperty[editor] = property;
    … …  
    455453    m_expandIcon = drawIndicatorIcon(q_ptr->palette(), q_ptr->style());
    456454
    457     QObject::connect(m_treeWidget, SIGNAL(collapsed(const QModelIndex &)), q_ptr, SLOT(slotCollapsed(const QModelIndex &)));
    458     QObject::connect(m_treeWidget, SIGNAL(expanded(const QModelIndex &)), q_ptr, SLOT(slotExpanded(const QModelIndex &)));
     455    QObject::connect(m_treeWidget, SIGNAL(collapsed(QModelIndex)), q_ptr, SLOT(slotCollapsed(QModelIndex)));
     456    QObject::connect(m_treeWidget, SIGNAL(expanded(QModelIndex)), q_ptr, SLOT(slotExpanded(QModelIndex)));
    459457    QObject::connect(m_treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), q_ptr, SLOT(slotCurrentTreeItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
    460458}
    … …  
    729727*/
    730728QtTreePropertyBrowser::QtTreePropertyBrowser(QWidget *parent)
    731     : QtAbstractPropertyBrowser(parent)
    732 {
    733     d_ptr = new QtTreePropertyBrowserPrivate;
     729    : QtAbstractPropertyBrowser(parent), d_ptr(new QtTreePropertyBrowserPrivate)
     730{
    734731    d_ptr->q_ptr = this;
    735732
    … …  
    750747QtTreePropertyBrowser::~QtTreePropertyBrowser()
    751748{
    752     delete d_ptr;
    753749}
    754750
    … …  
    10411037}
    10421038
    1043 #if QT_VERSION >= 0x040400
    10441039QT_END_NAMESPACE
    1045 #endif
    10461040
    10471041#include "moc_qttreepropertybrowser.cpp"

  • trunk/tools/shared/qtpropertybrowser/qttreepropertybrowser.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4545#include "qtpropertybrowser.h"
    4646
    47 #if QT_VERSION >= 0x040400
    4847QT_BEGIN_NAMESPACE
    49 #endif
    5048
    5149class QTreeWidgetItem;
    … …  
    121119private:
    122120
    123     QtTreePropertyBrowserPrivate *d_ptr;
     121    QScopedPointer<QtTreePropertyBrowserPrivate> d_ptr;
    124122    Q_DECLARE_PRIVATE(QtTreePropertyBrowser)
    125123    Q_DISABLE_COPY(QtTreePropertyBrowser)
    … …  
    132130};
    133131
    134 #if QT_VERSION >= 0x040400
    135132QT_END_NAMESPACE
    136 #endif
    137133
    138134#endif

  • trunk/tools/shared/qtpropertybrowser/qtvariantproperty.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5252#endif
    5353
    54 #if QT_VERSION >= 0x040400
    5554QT_BEGIN_NAMESPACE
    56 #endif
    5755
    5856class QtEnumPropertyType
    … …  
    7068};
    7169
    72 #if QT_VERSION >= 0x040400
    7370QT_END_NAMESPACE
    74 #endif
    7571
    7672Q_DECLARE_METATYPE(QtEnumPropertyType)
    … …  
    7874Q_DECLARE_METATYPE(QtGroupPropertyType)
    7975
    80 #if QT_VERSION >= 0x040400
    8176QT_BEGIN_NAMESPACE
    82 #endif
    8377
    8478/*!
    … …  
    195189*/
    196190QtVariantProperty::QtVariantProperty(QtVariantPropertyManager *manager)
    197     : QtProperty(manager),  d_ptr(new QtVariantPropertyPrivate(manager))
    198 {
    199 
     191    : QtProperty(manager), d_ptr(new QtVariantPropertyPrivate(manager))
     192{
    200193}
    201194
    … …  
    207200QtVariantProperty::~QtVariantProperty()
    208201{
    209     delete d_ptr;
    210202}
    211203
    … …  
    919911*/
    920912QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
    921     : QtAbstractPropertyManager(parent)
    922 {
    923     d_ptr = new QtVariantPropertyManagerPrivate;
     913    : QtAbstractPropertyManager(parent), d_ptr(new QtVariantPropertyManagerPrivate)
     914{
    924915    d_ptr->q_ptr = this;
    925916
    … …  
    936927    d_ptr->m_typeToAttributeToAttributeType[QVariant::Int][d_ptr->m_singleStepAttribute] = QVariant::Int;
    937928    d_ptr->m_typeToValueType[QVariant::Int] = QVariant::Int;
    938     connect(intPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    939                 this, SLOT(slotValueChanged(QtProperty *, int)));
    940     connect(intPropertyManager, SIGNAL(rangeChanged(QtProperty *, int, int)),
    941                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    942     connect(intPropertyManager, SIGNAL(singleStepChanged(QtProperty *, int)),
    943                 this, SLOT(slotSingleStepChanged(QtProperty *, int)));
     929    connect(intPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     930                this, SLOT(slotValueChanged(QtProperty*,int)));
     931    connect(intPropertyManager, SIGNAL(rangeChanged(QtProperty*,int,int)),
     932                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     933    connect(intPropertyManager, SIGNAL(singleStepChanged(QtProperty*,int)),
     934                this, SLOT(slotSingleStepChanged(QtProperty*,int)));
    944935    // DoublePropertyManager
    945936    QtDoublePropertyManager *doublePropertyManager = new QtDoublePropertyManager(this);
    … …  
    954945            QVariant::Int;
    955946    d_ptr->m_typeToValueType[QVariant::Double] = QVariant::Double;
    956     connect(doublePropertyManager, SIGNAL(valueChanged(QtProperty *, double)),
    957                 this, SLOT(slotValueChanged(QtProperty *, double)));
    958     connect(doublePropertyManager, SIGNAL(rangeChanged(QtProperty *, double, double)),
    959                 this, SLOT(slotRangeChanged(QtProperty *, double, double)));
    960     connect(doublePropertyManager, SIGNAL(singleStepChanged(QtProperty *, double)),
    961                 this, SLOT(slotSingleStepChanged(QtProperty *, double)));
    962     connect(doublePropertyManager, SIGNAL(decimalsChanged(QtProperty *, int)),
    963                 this, SLOT(slotDecimalsChanged(QtProperty *, int)));
     947    connect(doublePropertyManager, SIGNAL(valueChanged(QtProperty*,double)),
     948                this, SLOT(slotValueChanged(QtProperty*,double)));
     949    connect(doublePropertyManager, SIGNAL(rangeChanged(QtProperty*,double,double)),
     950                this, SLOT(slotRangeChanged(QtProperty*,double,double)));
     951    connect(doublePropertyManager, SIGNAL(singleStepChanged(QtProperty*,double)),
     952                this, SLOT(slotSingleStepChanged(QtProperty*,double)));
     953    connect(doublePropertyManager, SIGNAL(decimalsChanged(QtProperty*,int)),
     954                this, SLOT(slotDecimalsChanged(QtProperty*,int)));
    964955    // BoolPropertyManager
    965956    QtBoolPropertyManager *boolPropertyManager = new QtBoolPropertyManager(this);
    966957    d_ptr->m_typeToPropertyManager[QVariant::Bool] = boolPropertyManager;
    967958    d_ptr->m_typeToValueType[QVariant::Bool] = QVariant::Bool;
    968     connect(boolPropertyManager, SIGNAL(valueChanged(QtProperty *, bool)),
    969                 this, SLOT(slotValueChanged(QtProperty *, bool)));
     959    connect(boolPropertyManager, SIGNAL(valueChanged(QtProperty*,bool)),
     960                this, SLOT(slotValueChanged(QtProperty*,bool)));
    970961    // StringPropertyManager
    971962    QtStringPropertyManager *stringPropertyManager = new QtStringPropertyManager(this);
    … …  
    974965    d_ptr->m_typeToAttributeToAttributeType[QVariant::String][d_ptr->m_regExpAttribute] =
    975966            QVariant::RegExp;
    976     connect(stringPropertyManager, SIGNAL(valueChanged(QtProperty *, const QString &)),
    977                 this, SLOT(slotValueChanged(QtProperty *, const QString &)));
    978     connect(stringPropertyManager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
    979                 this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
     967    connect(stringPropertyManager, SIGNAL(valueChanged(QtProperty*,QString)),
     968                this, SLOT(slotValueChanged(QtProperty*,QString)));
     969    connect(stringPropertyManager, SIGNAL(regExpChanged(QtProperty*,QRegExp)),
     970                this, SLOT(slotRegExpChanged(QtProperty*,QRegExp)));
    980971    // DatePropertyManager
    981972    QtDatePropertyManager *datePropertyManager = new QtDatePropertyManager(this);
    … …  
    986977    d_ptr->m_typeToAttributeToAttributeType[QVariant::Date][d_ptr->m_maximumAttribute] =
    987978            QVariant::Date;
    988     connect(datePropertyManager, SIGNAL(valueChanged(QtProperty *, const QDate &)),
    989                 this, SLOT(slotValueChanged(QtProperty *, const QDate &)));
    990     connect(datePropertyManager, SIGNAL(rangeChanged(QtProperty *, const QDate &, const QDate &)),
    991                 this, SLOT(slotRangeChanged(QtProperty *, const QDate &, const QDate &)));
     979    connect(datePropertyManager, SIGNAL(valueChanged(QtProperty*,QDate)),
     980                this, SLOT(slotValueChanged(QtProperty*,QDate)));
     981    connect(datePropertyManager, SIGNAL(rangeChanged(QtProperty*,QDate,QDate)),
     982                this, SLOT(slotRangeChanged(QtProperty*,QDate,QDate)));
    992983    // TimePropertyManager
    993984    QtTimePropertyManager *timePropertyManager = new QtTimePropertyManager(this);
    994985    d_ptr->m_typeToPropertyManager[QVariant::Time] = timePropertyManager;
    995986    d_ptr->m_typeToValueType[QVariant::Time] = QVariant::Time;
    996     connect(timePropertyManager, SIGNAL(valueChanged(QtProperty *, const QTime &)),
    997                 this, SLOT(slotValueChanged(QtProperty *, const QTime &)));
     987    connect(timePropertyManager, SIGNAL(valueChanged(QtProperty*,QTime)),
     988                this, SLOT(slotValueChanged(QtProperty*,QTime)));
    998989    // DateTimePropertyManager
    999990    QtDateTimePropertyManager *dateTimePropertyManager = new QtDateTimePropertyManager(this);
    1000991    d_ptr->m_typeToPropertyManager[QVariant::DateTime] = dateTimePropertyManager;
    1001992    d_ptr->m_typeToValueType[QVariant::DateTime] = QVariant::DateTime;
    1002     connect(dateTimePropertyManager, SIGNAL(valueChanged(QtProperty *, const QDateTime &)),
    1003                 this, SLOT(slotValueChanged(QtProperty *, const QDateTime &)));
     993    connect(dateTimePropertyManager, SIGNAL(valueChanged(QtProperty*,QDateTime)),
     994                this, SLOT(slotValueChanged(QtProperty*,QDateTime)));
    1004995    // KeySequencePropertyManager
    1005996    QtKeySequencePropertyManager *keySequencePropertyManager = new QtKeySequencePropertyManager(this);
    1006997    d_ptr->m_typeToPropertyManager[QVariant::KeySequence] = keySequencePropertyManager;
    1007998    d_ptr->m_typeToValueType[QVariant::KeySequence] = QVariant::KeySequence;
    1008     connect(keySequencePropertyManager, SIGNAL(valueChanged(QtProperty *, const QKeySequence &)),
    1009                 this, SLOT(slotValueChanged(QtProperty *, const QKeySequence &)));
     999    connect(keySequencePropertyManager, SIGNAL(valueChanged(QtProperty*,QKeySequence)),
     1000                this, SLOT(slotValueChanged(QtProperty*,QKeySequence)));
    10101001    // CharPropertyManager
    10111002    QtCharPropertyManager *charPropertyManager = new QtCharPropertyManager(this);
    10121003    d_ptr->m_typeToPropertyManager[QVariant::Char] = charPropertyManager;
    10131004    d_ptr->m_typeToValueType[QVariant::Char] = QVariant::Char;
    1014     connect(charPropertyManager, SIGNAL(valueChanged(QtProperty *, const QChar &)),
    1015                 this, SLOT(slotValueChanged(QtProperty *, const QChar &)));
     1005    connect(charPropertyManager, SIGNAL(valueChanged(QtProperty*,QChar)),
     1006                this, SLOT(slotValueChanged(QtProperty*,QChar)));
    10161007    // LocalePropertyManager
    10171008    QtLocalePropertyManager *localePropertyManager = new QtLocalePropertyManager(this);
    10181009    d_ptr->m_typeToPropertyManager[QVariant::Locale] = localePropertyManager;
    10191010    d_ptr->m_typeToValueType[QVariant::Locale] = QVariant::Locale;
    1020     connect(localePropertyManager, SIGNAL(valueChanged(QtProperty *, const QLocale &)),
    1021                 this, SLOT(slotValueChanged(QtProperty *, const QLocale &)));
    1022     connect(localePropertyManager->subEnumPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1023                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1024     connect(localePropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1025                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1026     connect(localePropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1027                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1011    connect(localePropertyManager, SIGNAL(valueChanged(QtProperty*,QLocale)),
     1012                this, SLOT(slotValueChanged(QtProperty*,QLocale)));
     1013    connect(localePropertyManager->subEnumPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1014                this, SLOT(slotValueChanged(QtProperty*,int)));
     1015    connect(localePropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1016                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1017    connect(localePropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1018                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    10281019    // PointPropertyManager
    10291020    QtPointPropertyManager *pointPropertyManager = new QtPointPropertyManager(this);
    10301021    d_ptr->m_typeToPropertyManager[QVariant::Point] = pointPropertyManager;
    10311022    d_ptr->m_typeToValueType[QVariant::Point] = QVariant::Point;
    1032     connect(pointPropertyManager, SIGNAL(valueChanged(QtProperty *, const QPoint &)),
    1033                 this, SLOT(slotValueChanged(QtProperty *, const QPoint &)));
    1034     connect(pointPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1035                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1036     connect(pointPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1037                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1038     connect(pointPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1039                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1023    connect(pointPropertyManager, SIGNAL(valueChanged(QtProperty*,QPoint)),
     1024                this, SLOT(slotValueChanged(QtProperty*,QPoint)));
     1025    connect(pointPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1026                this, SLOT(slotValueChanged(QtProperty*,int)));
     1027    connect(pointPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1028                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1029    connect(pointPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1030                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    10401031    // PointFPropertyManager
    10411032    QtPointFPropertyManager *pointFPropertyManager = new QtPointFPropertyManager(this);
    … …  
    10441035    d_ptr->m_typeToAttributeToAttributeType[QVariant::PointF][d_ptr->m_decimalsAttribute] =
    10451036            QVariant::Int;
    1046     connect(pointFPropertyManager, SIGNAL(valueChanged(QtProperty *, const QPointF &)),
    1047                 this, SLOT(slotValueChanged(QtProperty *, const QPointF &)));
    1048     connect(pointFPropertyManager, SIGNAL(decimalsChanged(QtProperty *, int)),
    1049                 this, SLOT(slotDecimalsChanged(QtProperty *, int)));
    1050     connect(pointFPropertyManager->subDoublePropertyManager(), SIGNAL(valueChanged(QtProperty *, double)),
    1051                 this, SLOT(slotValueChanged(QtProperty *, double)));
    1052     connect(pointFPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1053                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1054     connect(pointFPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1055                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1037    connect(pointFPropertyManager, SIGNAL(valueChanged(QtProperty*,QPointF)),
     1038                this, SLOT(slotValueChanged(QtProperty*,QPointF)));
     1039    connect(pointFPropertyManager, SIGNAL(decimalsChanged(QtProperty*,int)),
     1040                this, SLOT(slotDecimalsChanged(QtProperty*,int)));
     1041    connect(pointFPropertyManager->subDoublePropertyManager(), SIGNAL(valueChanged(QtProperty*,double)),
     1042                this, SLOT(slotValueChanged(QtProperty*,double)));
     1043    connect(pointFPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1044                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1045    connect(pointFPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1046                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    10561047    // SizePropertyManager
    10571048    QtSizePropertyManager *sizePropertyManager = new QtSizePropertyManager(this);
    … …  
    10621053    d_ptr->m_typeToAttributeToAttributeType[QVariant::Size][d_ptr->m_maximumAttribute] =
    10631054            QVariant::Size;
    1064     connect(sizePropertyManager, SIGNAL(valueChanged(QtProperty *, const QSize &)),
    1065                 this, SLOT(slotValueChanged(QtProperty *, const QSize &)));
    1066     connect(sizePropertyManager, SIGNAL(rangeChanged(QtProperty *, const QSize &, const QSize &)),
    1067                 this, SLOT(slotRangeChanged(QtProperty *, const QSize &, const QSize &)));
    1068     connect(sizePropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1069                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1070     connect(sizePropertyManager->subIntPropertyManager(), SIGNAL(rangeChanged(QtProperty *, int, int)),
    1071                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    1072     connect(sizePropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1073                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1074     connect(sizePropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1075                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1055    connect(sizePropertyManager, SIGNAL(valueChanged(QtProperty*,QSize)),
     1056                this, SLOT(slotValueChanged(QtProperty*,QSize)));
     1057    connect(sizePropertyManager, SIGNAL(rangeChanged(QtProperty*,QSize,QSize)),
     1058                this, SLOT(slotRangeChanged(QtProperty*,QSize,QSize)));
     1059    connect(sizePropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1060                this, SLOT(slotValueChanged(QtProperty*,int)));
     1061    connect(sizePropertyManager->subIntPropertyManager(), SIGNAL(rangeChanged(QtProperty*,int,int)),
     1062                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     1063    connect(sizePropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1064                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1065    connect(sizePropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1066                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    10761067    // SizeFPropertyManager
    10771068    QtSizeFPropertyManager *sizeFPropertyManager = new QtSizeFPropertyManager(this);
    … …  
    10841075    d_ptr->m_typeToAttributeToAttributeType[QVariant::SizeF][d_ptr->m_decimalsAttribute] =
    10851076            QVariant::Int;
    1086     connect(sizeFPropertyManager, SIGNAL(valueChanged(QtProperty *, const QSizeF &)),
    1087                 this, SLOT(slotValueChanged(QtProperty *, const QSizeF &)));
    1088     connect(sizeFPropertyManager, SIGNAL(rangeChanged(QtProperty *, const QSizeF &, const QSizeF &)),
    1089                 this, SLOT(slotRangeChanged(QtProperty *, const QSizeF &, const QSizeF &)));
    1090     connect(sizeFPropertyManager, SIGNAL(decimalsChanged(QtProperty *, int)),
    1091                 this, SLOT(slotDecimalsChanged(QtProperty *, int)));
    1092     connect(sizeFPropertyManager->subDoublePropertyManager(), SIGNAL(valueChanged(QtProperty *, double)),
    1093                 this, SLOT(slotValueChanged(QtProperty *, double)));
    1094     connect(sizeFPropertyManager->subDoublePropertyManager(), SIGNAL(rangeChanged(QtProperty *, double, double)),
    1095                 this, SLOT(slotRangeChanged(QtProperty *, double, double)));
    1096     connect(sizeFPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1097                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1098     connect(sizeFPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1099                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1077    connect(sizeFPropertyManager, SIGNAL(valueChanged(QtProperty*,QSizeF)),
     1078                this, SLOT(slotValueChanged(QtProperty*,QSizeF)));
     1079    connect(sizeFPropertyManager, SIGNAL(rangeChanged(QtProperty*,QSizeF,QSizeF)),
     1080                this, SLOT(slotRangeChanged(QtProperty*,QSizeF,QSizeF)));
     1081    connect(sizeFPropertyManager, SIGNAL(decimalsChanged(QtProperty*,int)),
     1082                this, SLOT(slotDecimalsChanged(QtProperty*,int)));
     1083    connect(sizeFPropertyManager->subDoublePropertyManager(), SIGNAL(valueChanged(QtProperty*,double)),
     1084                this, SLOT(slotValueChanged(QtProperty*,double)));
     1085    connect(sizeFPropertyManager->subDoublePropertyManager(), SIGNAL(rangeChanged(QtProperty*,double,double)),
     1086                this, SLOT(slotRangeChanged(QtProperty*,double,double)));
     1087    connect(sizeFPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1088                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1089    connect(sizeFPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1090                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    11001091    // RectPropertyManager
    11011092    QtRectPropertyManager *rectPropertyManager = new QtRectPropertyManager(this);
    … …  
    11041095    d_ptr->m_typeToAttributeToAttributeType[QVariant::Rect][d_ptr->m_constraintAttribute] =
    11051096            QVariant::Rect;
    1106     connect(rectPropertyManager, SIGNAL(valueChanged(QtProperty *, const QRect &)),
    1107                 this, SLOT(slotValueChanged(QtProperty *, const QRect &)));
    1108     connect(rectPropertyManager, SIGNAL(constraintChanged(QtProperty *, const QRect &)),
    1109                 this, SLOT(slotConstraintChanged(QtProperty *, const QRect &)));
    1110     connect(rectPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1111                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1112     connect(rectPropertyManager->subIntPropertyManager(), SIGNAL(rangeChanged(QtProperty *, int, int)),
    1113                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    1114     connect(rectPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1115                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1116     connect(rectPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1117                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1097    connect(rectPropertyManager, SIGNAL(valueChanged(QtProperty*,QRect)),
     1098                this, SLOT(slotValueChanged(QtProperty*,QRect)));
     1099    connect(rectPropertyManager, SIGNAL(constraintChanged(QtProperty*,QRect)),
     1100                this, SLOT(slotConstraintChanged(QtProperty*,QRect)));
     1101    connect(rectPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1102                this, SLOT(slotValueChanged(QtProperty*,int)));
     1103    connect(rectPropertyManager->subIntPropertyManager(), SIGNAL(rangeChanged(QtProperty*,int,int)),
     1104                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     1105    connect(rectPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1106                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1107    connect(rectPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1108                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    11181109    // RectFPropertyManager
    11191110    QtRectFPropertyManager *rectFPropertyManager = new QtRectFPropertyManager(this);
    … …  
    11241115    d_ptr->m_typeToAttributeToAttributeType[QVariant::RectF][d_ptr->m_decimalsAttribute] =
    11251116            QVariant::Int;
    1126     connect(rectFPropertyManager, SIGNAL(valueChanged(QtProperty *, const QRectF &)),
    1127                 this, SLOT(slotValueChanged(QtProperty *, const QRectF &)));
    1128     connect(rectFPropertyManager, SIGNAL(constraintChanged(QtProperty *, const QRectF &)),
    1129                 this, SLOT(slotConstraintChanged(QtProperty *, const QRectF &)));
    1130     connect(rectFPropertyManager, SIGNAL(decimalsChanged(QtProperty *, int)),
    1131                 this, SLOT(slotDecimalsChanged(QtProperty *, int)));
    1132     connect(rectFPropertyManager->subDoublePropertyManager(), SIGNAL(valueChanged(QtProperty *, double)),
    1133                 this, SLOT(slotValueChanged(QtProperty *, double)));
    1134     connect(rectFPropertyManager->subDoublePropertyManager(), SIGNAL(rangeChanged(QtProperty *, double, double)),
    1135                 this, SLOT(slotRangeChanged(QtProperty *, double, double)));
    1136     connect(rectFPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1137                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1138     connect(rectFPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1139                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1117    connect(rectFPropertyManager, SIGNAL(valueChanged(QtProperty*,QRectF)),
     1118                this, SLOT(slotValueChanged(QtProperty*,QRectF)));
     1119    connect(rectFPropertyManager, SIGNAL(constraintChanged(QtProperty*,QRectF)),
     1120                this, SLOT(slotConstraintChanged(QtProperty*,QRectF)));
     1121    connect(rectFPropertyManager, SIGNAL(decimalsChanged(QtProperty*,int)),
     1122                this, SLOT(slotDecimalsChanged(QtProperty*,int)));
     1123    connect(rectFPropertyManager->subDoublePropertyManager(), SIGNAL(valueChanged(QtProperty*,double)),
     1124                this, SLOT(slotValueChanged(QtProperty*,double)));
     1125    connect(rectFPropertyManager->subDoublePropertyManager(), SIGNAL(rangeChanged(QtProperty*,double,double)),
     1126                this, SLOT(slotRangeChanged(QtProperty*,double,double)));
     1127    connect(rectFPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1128                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1129    connect(rectFPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1130                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    11401131    // ColorPropertyManager
    11411132    QtColorPropertyManager *colorPropertyManager = new QtColorPropertyManager(this);
    11421133    d_ptr->m_typeToPropertyManager[QVariant::Color] = colorPropertyManager;
    11431134    d_ptr->m_typeToValueType[QVariant::Color] = QVariant::Color;
    1144     connect(colorPropertyManager, SIGNAL(valueChanged(QtProperty *, const QColor &)),
    1145                 this, SLOT(slotValueChanged(QtProperty *, const QColor &)));
    1146     connect(colorPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1147                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1148     connect(colorPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1149                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1150     connect(colorPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1151                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1135    connect(colorPropertyManager, SIGNAL(valueChanged(QtProperty*,QColor)),
     1136                this, SLOT(slotValueChanged(QtProperty*,QColor)));
     1137    connect(colorPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1138                this, SLOT(slotValueChanged(QtProperty*,int)));
     1139    connect(colorPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1140                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1141    connect(colorPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1142                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    11521143    // EnumPropertyManager
    11531144    int enumId = enumTypeId();
    … …  
    11591150    d_ptr->m_typeToAttributeToAttributeType[enumId][d_ptr->m_enumIconsAttribute] =
    11601151            iconMapTypeId();
    1161     connect(enumPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    1162                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1163     connect(enumPropertyManager, SIGNAL(enumNamesChanged(QtProperty *, const QStringList &)),
    1164                 this, SLOT(slotEnumNamesChanged(QtProperty *, const QStringList &)));
    1165     connect(enumPropertyManager, SIGNAL(enumIconsChanged(QtProperty *, const QMap<int, QIcon> &)),
    1166                 this, SLOT(slotEnumIconsChanged(QtProperty *, const QMap<int, QIcon> &)));
     1152    connect(enumPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     1153                this, SLOT(slotValueChanged(QtProperty*,int)));
     1154    connect(enumPropertyManager, SIGNAL(enumNamesChanged(QtProperty*,QStringList)),
     1155                this, SLOT(slotEnumNamesChanged(QtProperty*,QStringList)));
     1156    connect(enumPropertyManager, SIGNAL(enumIconsChanged(QtProperty*,QMap<int,QIcon>)),
     1157                this, SLOT(slotEnumIconsChanged(QtProperty*,QMap<int,QIcon>)));
    11671158    // SizePolicyPropertyManager
    11681159    QtSizePolicyPropertyManager *sizePolicyPropertyManager = new QtSizePolicyPropertyManager(this);
    11691160    d_ptr->m_typeToPropertyManager[QVariant::SizePolicy] = sizePolicyPropertyManager;
    11701161    d_ptr->m_typeToValueType[QVariant::SizePolicy] = QVariant::SizePolicy;
    1171     connect(sizePolicyPropertyManager, SIGNAL(valueChanged(QtProperty *, const QSizePolicy &)),
    1172                 this, SLOT(slotValueChanged(QtProperty *, const QSizePolicy &)));
    1173     connect(sizePolicyPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1174                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1175     connect(sizePolicyPropertyManager->subIntPropertyManager(), SIGNAL(rangeChanged(QtProperty *, int, int)),
    1176                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    1177     connect(sizePolicyPropertyManager->subEnumPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1178                 this, SLOT(slotValueChanged(QtProperty *, int)));
     1162    connect(sizePolicyPropertyManager, SIGNAL(valueChanged(QtProperty*,QSizePolicy)),
     1163                this, SLOT(slotValueChanged(QtProperty*,QSizePolicy)));
     1164    connect(sizePolicyPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1165                this, SLOT(slotValueChanged(QtProperty*,int)));
     1166    connect(sizePolicyPropertyManager->subIntPropertyManager(), SIGNAL(rangeChanged(QtProperty*,int,int)),
     1167                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     1168    connect(sizePolicyPropertyManager->subEnumPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1169                this, SLOT(slotValueChanged(QtProperty*,int)));
    11791170    connect(sizePolicyPropertyManager->subEnumPropertyManager(),
    1180                 SIGNAL(enumNamesChanged(QtProperty *, const QStringList &)),
    1181                 this, SLOT(slotEnumNamesChanged(QtProperty *, const QStringList &)));
    1182     connect(sizePolicyPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1183                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1184     connect(sizePolicyPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1185                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1171                SIGNAL(enumNamesChanged(QtProperty*,QStringList)),
     1172                this, SLOT(slotEnumNamesChanged(QtProperty*,QStringList)));
     1173    connect(sizePolicyPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1174                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1175    connect(sizePolicyPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1176                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    11861177    // FontPropertyManager
    11871178    QtFontPropertyManager *fontPropertyManager = new QtFontPropertyManager(this);
    11881179    d_ptr->m_typeToPropertyManager[QVariant::Font] = fontPropertyManager;
    11891180    d_ptr->m_typeToValueType[QVariant::Font] = QVariant::Font;
    1190     connect(fontPropertyManager, SIGNAL(valueChanged(QtProperty *, const QFont &)),
    1191                 this, SLOT(slotValueChanged(QtProperty *, const QFont &)));
    1192     connect(fontPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1193                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1194     connect(fontPropertyManager->subIntPropertyManager(), SIGNAL(rangeChanged(QtProperty *, int, int)),
    1195                 this, SLOT(slotRangeChanged(QtProperty *, int, int)));
    1196     connect(fontPropertyManager->subEnumPropertyManager(), SIGNAL(valueChanged(QtProperty *, int)),
    1197                 this, SLOT(slotValueChanged(QtProperty *, int)));
     1181    connect(fontPropertyManager, SIGNAL(valueChanged(QtProperty*,QFont)),
     1182                this, SLOT(slotValueChanged(QtProperty*,QFont)));
     1183    connect(fontPropertyManager->subIntPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1184                this, SLOT(slotValueChanged(QtProperty*,int)));
     1185    connect(fontPropertyManager->subIntPropertyManager(), SIGNAL(rangeChanged(QtProperty*,int,int)),
     1186                this, SLOT(slotRangeChanged(QtProperty*,int,int)));
     1187    connect(fontPropertyManager->subEnumPropertyManager(), SIGNAL(valueChanged(QtProperty*,int)),
     1188                this, SLOT(slotValueChanged(QtProperty*,int)));
    11981189    connect(fontPropertyManager->subEnumPropertyManager(),
    1199                 SIGNAL(enumNamesChanged(QtProperty *, const QStringList &)),
    1200                 this, SLOT(slotEnumNamesChanged(QtProperty *, const QStringList &)));
    1201     connect(fontPropertyManager->subBoolPropertyManager(), SIGNAL(valueChanged(QtProperty *, bool)),
    1202                 this, SLOT(slotValueChanged(QtProperty *, bool)));
    1203     connect(fontPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1204                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1205     connect(fontPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1206                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1190                SIGNAL(enumNamesChanged(QtProperty*,QStringList)),
     1191                this, SLOT(slotEnumNamesChanged(QtProperty*,QStringList)));
     1192    connect(fontPropertyManager->subBoolPropertyManager(), SIGNAL(valueChanged(QtProperty*,bool)),
     1193                this, SLOT(slotValueChanged(QtProperty*,bool)));
     1194    connect(fontPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1195                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1196    connect(fontPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1197                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    12071198    // CursorPropertyManager
    12081199    QtCursorPropertyManager *cursorPropertyManager = new QtCursorPropertyManager(this);
    12091200    d_ptr->m_typeToPropertyManager[QVariant::Cursor] = cursorPropertyManager;
    12101201    d_ptr->m_typeToValueType[QVariant::Cursor] = QVariant::Cursor;
    1211     connect(cursorPropertyManager, SIGNAL(valueChanged(QtProperty *, const QCursor &)),
    1212                 this, SLOT(slotValueChanged(QtProperty *, const QCursor &)));
     1202    connect(cursorPropertyManager, SIGNAL(valueChanged(QtProperty*,QCursor)),
     1203                this, SLOT(slotValueChanged(QtProperty*,QCursor)));
    12131204    // FlagPropertyManager
    12141205    int flagId = flagTypeId();
    … …  
    12181209    d_ptr->m_typeToAttributeToAttributeType[flagId][d_ptr->m_flagNamesAttribute] =
    12191210            QVariant::StringList;
    1220     connect(flagPropertyManager, SIGNAL(valueChanged(QtProperty *, int)),
    1221                 this, SLOT(slotValueChanged(QtProperty *, int)));
    1222     connect(flagPropertyManager, SIGNAL(flagNamesChanged(QtProperty *, const QStringList &)),
    1223                 this, SLOT(slotFlagNamesChanged(QtProperty *, const QStringList &)));
    1224     connect(flagPropertyManager->subBoolPropertyManager(), SIGNAL(valueChanged(QtProperty *, bool)),
    1225                 this, SLOT(slotValueChanged(QtProperty *, bool)));
    1226     connect(flagPropertyManager, SIGNAL(propertyInserted(QtProperty *, QtProperty *, QtProperty *)),
    1227                 this, SLOT(slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)));
    1228     connect(flagPropertyManager, SIGNAL(propertyRemoved(QtProperty *, QtProperty *)),
    1229                 this, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
     1211    connect(flagPropertyManager, SIGNAL(valueChanged(QtProperty*,int)),
     1212                this, SLOT(slotValueChanged(QtProperty*,int)));
     1213    connect(flagPropertyManager, SIGNAL(flagNamesChanged(QtProperty*,QStringList)),
     1214                this, SLOT(slotFlagNamesChanged(QtProperty*,QStringList)));
     1215    connect(flagPropertyManager->subBoolPropertyManager(), SIGNAL(valueChanged(QtProperty*,bool)),
     1216                this, SLOT(slotValueChanged(QtProperty*,bool)));
     1217    connect(flagPropertyManager, SIGNAL(propertyInserted(QtProperty*,QtProperty*,QtProperty*)),
     1218                this, SLOT(slotPropertyInserted(QtProperty*,QtProperty*,QtProperty*)));
     1219    connect(flagPropertyManager, SIGNAL(propertyRemoved(QtProperty*,QtProperty*)),
     1220                this, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
    12301221    // FlagPropertyManager
    12311222    int groupId = groupTypeId();
    … …  
    12411232{
    12421233    clear();
    1243     delete d_ptr;
    12441234}
    12451235
    … …  
    19361926*/
    19371927QtVariantEditorFactory::QtVariantEditorFactory(QObject *parent)
    1938     : QtAbstractEditorFactory<QtVariantPropertyManager>(parent)
    1939 {
    1940     d_ptr = new QtVariantEditorFactoryPrivate();
     1928    : QtAbstractEditorFactory<QtVariantPropertyManager>(parent), d_ptr(new QtVariantEditorFactoryPrivate())
     1929{
    19411930    d_ptr->q_ptr = this;
    19421931
    … …  
    20001989QtVariantEditorFactory::~QtVariantEditorFactory()
    20011990{
    2002     delete d_ptr;
    20031991}
    20041992
    … …  
    22762264}
    22772265
    2278 #if QT_VERSION >= 0x040400
    22792266QT_END_NAMESPACE
    2280 #endif
    22812267
    22822268#include "moc_qtvariantproperty.cpp"

  • trunk/tools/shared/qtpropertybrowser/qtvariantproperty.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4747#include <QtGui/QIcon>
    4848
    49 #if QT_VERSION >= 0x040400
    5049QT_BEGIN_NAMESPACE
    51 #endif
    5250
    5351typedef QMap<int, QIcon> QtIconMap;
    … …  
    7068private:
    7169    friend class QtVariantPropertyManager;
    72     class QtVariantPropertyPrivate *d_ptr;
     70    QScopedPointer<class QtVariantPropertyPrivate> d_ptr;
    7371};
    7472
    … …  
    114112    virtual QtProperty *createProperty();
    115113private:
    116     class QtVariantPropertyManagerPrivate *d_ptr;
     114    QScopedPointer<class QtVariantPropertyManagerPrivate> d_ptr;
    117115    Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, int))
    118116    Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
    … …  
    168166    void disconnectPropertyManager(QtVariantPropertyManager *manager);
    169167private:
    170     class QtVariantEditorFactoryPrivate *d_ptr;
     168    QScopedPointer<class QtVariantEditorFactoryPrivate> d_ptr;
    171169    Q_DECLARE_PRIVATE(QtVariantEditorFactory)
    172170    Q_DISABLE_COPY(QtVariantEditorFactory)
    173171};
    174172
    175 #if QT_VERSION >= 0x040400
    176173QT_END_NAMESPACE
    177 #endif
    178174
    179175Q_DECLARE_METATYPE(QIcon)
Note: See TracChangeset for help on using the changeset viewer.