- Timestamp:
- Mar 8, 2010, 12:52:58 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.2 (added) merged: 650 /branches/vendor/nokia/qt/current merged: 649 /branches/vendor/nokia/qt/4.6.1 removed
- Property svn:mergeinfo changed
-
trunk/tools/shared/qtpropertybrowser/qtpropertymanager.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 1554 1554 Q_DECLARE_PUBLIC(QtDatePropertyManager) 1555 1555 public: 1556 explicit QtDatePropertyManagerPrivate(QtDatePropertyManager *q); 1556 1557 1557 1558 struct Data … … 1574 1575 }; 1575 1576 1577 QtDatePropertyManagerPrivate::QtDatePropertyManagerPrivate(QtDatePropertyManager *q) : 1578 q_ptr(q), 1579 m_format(QtPropertyBrowserUtils::dateFormat()) 1580 { 1581 } 1582 1576 1583 /*! 1577 1584 \class QtDatePropertyManager … … 1623 1630 */ 1624 1631 QtDatePropertyManager::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 { 1631 1634 } 1632 1635 … … 1787 1790 Q_DECLARE_PUBLIC(QtTimePropertyManager) 1788 1791 public: 1789 1790 QString m_format; 1792 explicit QtTimePropertyManagerPrivate(QtTimePropertyManager *q); 1793 1794 const QString m_format; 1791 1795 1792 1796 typedef QMap<const QtProperty *, QTime> PropertyValueMap; 1793 1797 PropertyValueMap m_values; 1794 1798 }; 1799 1800 QtTimePropertyManagerPrivate::QtTimePropertyManagerPrivate(QtTimePropertyManager *q) : 1801 q_ptr(q), 1802 m_format(QtPropertyBrowserUtils::timeFormat()) 1803 { 1804 } 1795 1805 1796 1806 /*! … … 1826 1836 */ 1827 1837 QtTimePropertyManager::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 { 1834 1840 } 1835 1841 … … 1904 1910 Q_DECLARE_PUBLIC(QtDateTimePropertyManager) 1905 1911 public: 1906 1907 QString m_format; 1912 explicit QtDateTimePropertyManagerPrivate(QtDateTimePropertyManager *q); 1913 1914 const QString m_format; 1908 1915 1909 1916 typedef QMap<const QtProperty *, QDateTime> PropertyValueMap; 1910 1917 PropertyValueMap m_values; 1911 1918 }; 1919 1920 QtDateTimePropertyManagerPrivate::QtDateTimePropertyManagerPrivate(QtDateTimePropertyManager *q) : 1921 q_ptr(q), 1922 m_format(QtPropertyBrowserUtils::dateTimeFormat()) 1923 { 1924 } 1912 1925 1913 1926 /*! \class QtDateTimePropertyManager … … 1939 1952 */ 1940 1953 QtDateTimePropertyManager::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 { 1949 1956 } 1950 1957
Note:
See TracChangeset
for help on using the changeset viewer.