Changeset 561 for trunk/tools/shared/qtpropertybrowser/qtpropertymanager.h

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:

• . (modified) (1 prop)
• tools/shared/qtpropertybrowser/qtpropertymanager.h (modified) (26 diffs)

trunk/tools/shared/qtpropertybrowser/qtpropertymanager.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #include "qtpropertybrowser.h"
 
-#if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
-#endif
 
 class QDate;
@@ -97 +95 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtIntPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtIntPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtIntPropertyManager)
     Q_DISABLE_COPY(QtIntPropertyManager)
@@ -123 +121 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtBoolPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtBoolPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtBoolPropertyManager)
     Q_DISABLE_COPY(QtBoolPropertyManager)
@@ -160 +158 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtDoublePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtDoublePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDoublePropertyManager)
     Q_DISABLE_COPY(QtDoublePropertyManager)
@@ -188 +186 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtStringPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtStringPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtStringPropertyManager)
     Q_DISABLE_COPY(QtStringPropertyManager)
@@ -219 +217 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtDatePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtDatePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDatePropertyManager)
     Q_DISABLE_COPY(QtDatePropertyManager)
@@ -244 +242 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtTimePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtTimePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtTimePropertyManager)
     Q_DISABLE_COPY(QtTimePropertyManager)
@@ -269 +267 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtDateTimePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtDateTimePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDateTimePropertyManager)
     Q_DISABLE_COPY(QtDateTimePropertyManager)
@@ -294 +292 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtKeySequencePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtKeySequencePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtKeySequencePropertyManager)
     Q_DISABLE_COPY(QtKeySequencePropertyManager)
@@ -319 +317 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtCharPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtCharPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCharPropertyManager)
     Q_DISABLE_COPY(QtCharPropertyManager)
@@ -347 +345 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtLocalePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtLocalePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtLocalePropertyManager)
     Q_DISABLE_COPY(QtLocalePropertyManager)
@@ -376 +374 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtPointPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtPointPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtPointPropertyManager)
     Q_DISABLE_COPY(QtPointPropertyManager)
@@ -408 +406 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtPointFPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtPointFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtPointFPropertyManager)
     Q_DISABLE_COPY(QtPointFPropertyManager)
@@ -443 +441 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtSizePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtSizePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizePropertyManager)
     Q_DISABLE_COPY(QtSizePropertyManager)
@@ -481 +479 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtSizeFPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtSizeFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizeFPropertyManager)
     Q_DISABLE_COPY(QtSizeFPropertyManager)
@@ -513 +511 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtRectPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtRectPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtRectPropertyManager)
     Q_DISABLE_COPY(QtRectPropertyManager)
@@ -548 +546 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtRectFPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtRectFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtRectFPropertyManager)
     Q_DISABLE_COPY(QtRectFPropertyManager)
@@ -582 +580 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtEnumPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtEnumPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtEnumPropertyManager)
     Q_DISABLE_COPY(QtEnumPropertyManager)
@@ -612 +610 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtFlagPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtFlagPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFlagPropertyManager)
     Q_DISABLE_COPY(QtFlagPropertyManager)
@@ -642 +640 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtSizePolicyPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtSizePolicyPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager)
     Q_DISABLE_COPY(QtSizePolicyPropertyManager)
@@ -675 +673 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtFontPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtFontPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFontPropertyManager)
     Q_DISABLE_COPY(QtFontPropertyManager)
@@ -709 +707 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtColorPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtColorPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorPropertyManager)
     Q_DISABLE_COPY(QtColorPropertyManager)
@@ -739 +737 @@
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtCursorPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtCursorPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCursorPropertyManager)
     Q_DISABLE_COPY(QtCursorPropertyManager)
 };
 
-#if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
+
 #endif
-
-#endif