Changeset 769 for trunk/tools/shared

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/shared/findwidget/abstractfindwidget.h (modified) (1 diff)
• tools/shared/findwidget/itemviewfindwidget.h (modified) (1 diff)
• tools/shared/findwidget/texteditfindwidget.h (modified) (1 diff)
• tools/shared/fontpanel/fontpanel.cpp (modified) (1 diff)
• tools/shared/qtgradienteditor/qtgradientutils.cpp (modified) (1 diff)
• tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp (modified) (1 diff)
• tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h (modified) (1 diff)
• tools/shared/qtpropertybrowser/qtpropertymanager.cpp (modified) (4 diffs)
• tools/shared/qttoolbardialog/qttoolbardialog.h (modified) (2 diffs)
• tools/shared/symbian (copied) (copied from branches/vendor/nokia/qt/4.6.3/tools/shared/symbian )
• tools/shared/symbian/epocroot.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/tools/shared/symbian/epocroot.cpp )
• tools/shared/symbian/epocroot.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/tools/shared/symbian/epocroot.h )
• tools/shared/windows (copied) (copied from branches/vendor/nokia/qt/4.6.3/tools/shared/windows )
• tools/shared/windows/registry.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/tools/shared/windows/registry.cpp )
• tools/shared/windows/registry.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/tools/shared/windows/registry.h )

trunk/tools/shared/findwidget/abstractfindwidget.h

@@ -71 +71 @@
     Q_DECLARE_FLAGS(FindFlags, FindFlag)
 
-    AbstractFindWidget(FindFlags flags = FindFlags(), QWidget *parent = 0);
+    AbstractFindWidget(FindFlags flags = FindFlags(), QWidget *parent = 0);
     virtual ~AbstractFindWidget();
 

trunk/tools/shared/findwidget/itemviewfindwidget.h

@@ -56 +56 @@
 
 public:
-    ItemViewFindWidget(FindFlags flags = FindFlags(), QWidget *parent = 0);
+    ItemViewFindWidget(FindFlags flags = FindFlags(), QWidget *parent = 0);
 
     QAbstractItemView *itemView() const

trunk/tools/shared/findwidget/texteditfindwidget.h

@@ -54 +54 @@
 
 public:
-    TextEditFindWidget(FindFlags flags = FindFlags(), QWidget *parent = 0);
+    TextEditFindWidget(FindFlags flags = FindFlags(), QWidget *parent = 0);
 
     QTextEdit *textEdit() const

trunk/tools/shared/fontpanel/fontpanel.cpp

@@ -218 +218 @@
 
     if (hasStyles) {
-        foreach (QString style, styles) {
+        foreach (style, styles) {
             // try to maintain selection or select 'normal' preferably
             const int newIndex = m_styleComboBox->count();

trunk/tools/shared/qtgradienteditor/qtgradientutils.cpp

@@ -396 +396 @@
 {
     QStringList result;
-    foreach (QGradientStop stop, gradient.stops()) {
+    foreach (stop, gradient.stops()) {
         const QColor color = stop.second;
 

trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp

@@ -94 +94 @@
 }
 
+
+
+
+
+
+
+
+
 void QtCursorDatabase::appendCursor(Qt::CursorShape shape, const QString &name, const QIcon &icon)
 {
     if (m_cursorShapeToValue.contains(shape))
         return;
-    int value = m_cursorNames.count();
+    int value = m_cursorNames.count();
     m_cursorNames.append(name);
-    m_cursorIcons[value] = icon;
-    m_valueToCursorShape[value] = shape;
-    m_cursorShapeToValue[shape] = value;
+    m_cursorIcons;
+    m_valueToCursorShape;
+    m_cursorShapeToValue;
 }
 

trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h

@@ -69 +69 @@
 public:
     QtCursorDatabase();
+
 
     QStringList cursorShapeNames() const;

trunk/tools/shared/qtpropertybrowser/qtpropertymanager.cpp

@@ -1392 +1392 @@
 
 // QtBoolPropertyManager
-
-class QtBoolPropertyManagerPrivate
-{
-    QtBoolPropertyManager *q_ptr;
-    Q_DECLARE_PUBLIC(QtBoolPropertyManager)
-public:
-
-    QMap<const QtProperty *, bool> m_values;
-};
-
-/*!
-    \class QtBoolPropertyManager
-    \internal
-    \inmodule QtDesigner
-    \since 4.4
-
-    \brief The QtBoolPropertyManager class provides and manages boolean properties.
-
-    The property's value can be retrieved using the value() function,
-    and set using the setValue() slot.
-
-    In addition, QtBoolPropertyManager provides the valueChanged() signal
-    which is emitted whenever a property created by this manager
-    changes.
-
-    \sa QtAbstractPropertyManager, QtCheckBoxFactory
-*/
-
-/*!
-    \fn void QtBoolPropertyManager::valueChanged(QtProperty *property, bool value)
-
-    This signal is emitted whenever a property created by this manager
-    changes its value, passing a pointer to the \a property and the
-    new \a value as parameters.
-*/
-
-/*!
-    Creates a manager with the given \a parent.
-*/
-QtBoolPropertyManager::QtBoolPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent), d_ptr(new QtBoolPropertyManagerPrivate)
-{
-    d_ptr->q_ptr = this;
-}
-
-/*!
-    Destroys this manager, and all the properties it has created.
-*/
-QtBoolPropertyManager::~QtBoolPropertyManager()
-{
-    clear();
-}
-
-/*!
-    Returns the given \a property's value.
-
-    If the given \a property is not managed by \e this manager, this
-    function returns false.
-
-    \sa setValue()
-*/
-bool QtBoolPropertyManager::value(const QtProperty *property) const
-{
-    return d_ptr->m_values.value(property, false);
-}
-
-/*!
-    \reimp
-*/
-QString QtBoolPropertyManager::valueText(const QtProperty *property) const
-{
-    const QMap<const QtProperty *, bool>::const_iterator it = d_ptr->m_values.constFind(property);
-    if (it == d_ptr->m_values.constEnd())
-        return QString();
-
-    static const QString trueText = tr("True");
-    static const QString falseText = tr("False");
-    return it.value() ? trueText : falseText;
-}
-
-// Return an icon containing a check box indicator
+//     Return an icon containing a check box indicator
 static QIcon drawCheckBox(bool value)
 {
@@ -1502 +1422 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*!
     \reimp
@@ -1511 +1519 @@
         return QIcon();
 
-    static const QIcon checkedIcon = drawCheckBox(true);
-    static const QIcon uncheckedIcon = drawCheckBox(false);
-    return it.value() ? checkedIcon : uncheckedIcon;
+    return it.value() ? d_ptr->m_checkedIcon : d_ptr->m_uncheckedIcon;
 }
 
@@ -6288 +6294 @@
 // QtCursorPropertyManager
 
-Q_GLOBAL_STATIC(QtCursorDatabase, cursorDatabase)
+// Make sure icons are removed as soon as QApplication is destroyed, otherwise,
+// handles are leaked on X11.
+static void clearCursorDatabase();
+Q_GLOBAL_STATIC_WITH_INITIALIZER(QtCursorDatabase, cursorDatabase, qAddPostRoutine(clearCursorDatabase))
+
+static void clearCursorDatabase()
+{
+    cursorDatabase()->clear();
+}
 
 class QtCursorPropertyManagerPrivate

trunk/tools/shared/qttoolbardialog/qttoolbardialog.h

@@ -69 +69 @@
 public:
 
-    QtToolBarManager(QObject *parent = 0);
+    QtToolBarManager(QObject *parent = 0);
     ~QtToolBarManager();
 
@@ -101 +101 @@
 public:
 
-    QtToolBarDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    QtToolBarDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
     ~QtToolBarDialog();