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:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • 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"
Note: See TracChangeset for help on using the changeset viewer.