Ignore:
Timestamp:
Mar 8, 2010, 12:52:58 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.2 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    15541554    Q_DECLARE_PUBLIC(QtDatePropertyManager)
    15551555public:
     1556    explicit QtDatePropertyManagerPrivate(QtDatePropertyManager *q);
    15561557
    15571558    struct Data
     
    15741575};
    15751576
     1577QtDatePropertyManagerPrivate::QtDatePropertyManagerPrivate(QtDatePropertyManager *q) :
     1578    q_ptr(q),
     1579    m_format(QtPropertyBrowserUtils::dateFormat())
     1580{
     1581}
     1582
    15761583/*!
    15771584    \class QtDatePropertyManager
     
    16231630*/
    16241631QtDatePropertyManager::QtDatePropertyManager(QObject *parent)
    1625     : QtAbstractPropertyManager(parent), d_ptr(new QtDatePropertyManagerPrivate)
    1626 {
    1627     d_ptr->q_ptr = this;
    1628 
    1629     QLocale loc;
    1630     d_ptr->m_format = loc.dateFormat(QLocale::ShortFormat);
     1632    : QtAbstractPropertyManager(parent), d_ptr(new QtDatePropertyManagerPrivate(this))
     1633{
    16311634}
    16321635
     
    17871790    Q_DECLARE_PUBLIC(QtTimePropertyManager)
    17881791public:
    1789 
    1790     QString m_format;
     1792    explicit QtTimePropertyManagerPrivate(QtTimePropertyManager *q);
     1793
     1794    const QString m_format;
    17911795
    17921796    typedef QMap<const QtProperty *, QTime> PropertyValueMap;
    17931797    PropertyValueMap m_values;
    17941798};
     1799
     1800QtTimePropertyManagerPrivate::QtTimePropertyManagerPrivate(QtTimePropertyManager *q) :
     1801    q_ptr(q),
     1802    m_format(QtPropertyBrowserUtils::timeFormat())
     1803{
     1804}
    17951805
    17961806/*!
     
    18261836*/
    18271837QtTimePropertyManager::QtTimePropertyManager(QObject *parent)
    1828     : QtAbstractPropertyManager(parent), d_ptr(new QtTimePropertyManagerPrivate)
    1829 {
    1830     d_ptr->q_ptr = this;
    1831 
    1832     QLocale loc;
    1833     d_ptr->m_format = loc.timeFormat(QLocale::ShortFormat);
     1838    : QtAbstractPropertyManager(parent), d_ptr(new QtTimePropertyManagerPrivate(this))
     1839{
    18341840}
    18351841
     
    19041910    Q_DECLARE_PUBLIC(QtDateTimePropertyManager)
    19051911public:
    1906 
    1907     QString m_format;
     1912    explicit QtDateTimePropertyManagerPrivate(QtDateTimePropertyManager *q);
     1913
     1914    const QString m_format;
    19081915
    19091916    typedef QMap<const QtProperty *, QDateTime> PropertyValueMap;
    19101917    PropertyValueMap m_values;
    19111918};
     1919
     1920QtDateTimePropertyManagerPrivate::QtDateTimePropertyManagerPrivate(QtDateTimePropertyManager *q) :
     1921    q_ptr(q),
     1922    m_format(QtPropertyBrowserUtils::dateTimeFormat())
     1923{
     1924}
    19121925
    19131926/*! \class QtDateTimePropertyManager
     
    19391952*/
    19401953QtDateTimePropertyManager::QtDateTimePropertyManager(QObject *parent)
    1941     : QtAbstractPropertyManager(parent), d_ptr(new QtDateTimePropertyManagerPrivate)
    1942 {
    1943     d_ptr->q_ptr = this;
    1944 
    1945     QLocale loc;
    1946     d_ptr->m_format = loc.dateFormat(QLocale::ShortFormat);
    1947     d_ptr->m_format += QLatin1Char(' ');
    1948     d_ptr->m_format += loc.timeFormat(QLocale::ShortFormat);
     1954    : QtAbstractPropertyManager(parent), d_ptr(new QtDateTimePropertyManagerPrivate(this))
     1955{
    19491956}
    19501957
Note: See TracChangeset for help on using the changeset viewer.