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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/shared/qtgradienteditor/qtcolorbutton.cpp

    r372 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**
    … …  
    6969void QtColorButtonPrivate::slotEditColor()
    7070{
    71     bool ok;
    72     const QRgb rgba = QColorDialog::getRgba(m_color.rgba(), &ok, q_ptr);
    73     if (!ok)
    74         return;
    75     const QColor c = QColor::fromRgba(rgba);
    76     if (c == q_ptr->color())
    77         return;
    78     q_ptr->setColor(c);
     71    const QColor newColor = QColorDialog::getColor(m_color, q_ptr, QString(), QColorDialog::ShowAlphaChannel);
     72    if (!newColor.isValid() || newColor == q_ptr->color())
     73        return;
     74    q_ptr->setColor(newColor);
    7975    emit q_ptr->colorChanged(m_color);
    8076}
    … …  
    122118
    123119QtColorButton::QtColorButton(QWidget *parent)
    124     : QToolButton(parent)
    125 {
    126     d_ptr = new QtColorButtonPrivate;
     120    : QToolButton(parent), d_ptr(new QtColorButtonPrivate)
     121{
    127122    d_ptr->q_ptr = this;
    128123#ifndef QT_NO_DRAGANDDROP
    … …  
    139134QtColorButton::~QtColorButton()
    140135{
    141     delete d_ptr;
    142136}
    143137

  • trunk/tools/shared/qtgradienteditor/qtcolorbutton.h

    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**
    … …  
    7676#endif
    7777private:
    78     class QtColorButtonPrivate *d_ptr;
     78    QScopedPointer<class QtColorButtonPrivate> d_ptr;
    7979    Q_DECLARE_PRIVATE(QtColorButton)
    8080    Q_DISABLE_COPY(QtColorButton)

  • trunk/tools/shared/qtgradienteditor/qtcolorline.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**
    … …  
    10001000
    10011001QtColorLine::QtColorLine(QWidget *parent)
    1002     : QWidget(parent)
    1003 {
    1004     d_ptr = new QtColorLinePrivate;
     1002    : QWidget(parent), d_ptr(new QtColorLinePrivate)
     1003{
    10051004    d_ptr->q_ptr = this;
    10061005
    … …  
    10101009QtColorLine::~QtColorLine()
    10111010{
    1012     delete d_ptr;
    10131011}
    10141012

  • trunk/tools/shared/qtgradienteditor/qtcolorline.h

    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**
    … …  
    115115private:
    116116
    117     class QtColorLinePrivate *d_ptr;
     117    QScopedPointer<class QtColorLinePrivate> d_ptr;
    118118    Q_DECLARE_PRIVATE(QtColorLine)
    119119    Q_DISABLE_COPY(QtColorLine)

  • trunk/tools/shared/qtgradienteditor/qtgradientdialog.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**
    4040****************************************************************************/
    41 
    42 /*
    43 TRANSLATOR qdesigner_internal::QtGradientDialog
    44 */
    4541
    4642#include "qtgradientdialog.h"
    … …  
    201197
    202198QtGradientDialog::QtGradientDialog(QWidget *parent)
    203     : QDialog(parent)
     199    : QDialog(parent), d_ptr(new QtGradientDialogPrivate())
    204200{
    205201//    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
    206     d_ptr = new QtGradientDialogPrivate();
    207202    d_ptr->q_ptr = this;
    208203    d_ptr->m_ui.setupUi(this);
    … …  
    213208    if (button)
    214209        button->setAutoDefault(false);
    215     connect(d_ptr->m_ui.gradientEditor, SIGNAL(aboutToShowDetails(bool, int)),
    216                 this, SLOT(slotAboutToShowDetails(bool, int)));
     210    connect(d_ptr->m_ui.gradientEditor, SIGNAL(aboutToShowDetails(bool,int)),
     211                this, SLOT(slotAboutToShowDetails(bool,int)));
    217212}
    218213
    … …  
    223218QtGradientDialog::~QtGradientDialog()
    224219{
    225     delete d_ptr;
    226220}
    227221

  • trunk/tools/shared/qtgradienteditor/qtgradientdialog.h

    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**
    … …  
    7777
    7878private:
    79     class QtGradientDialogPrivate *d_ptr;
     79    QScopedPointer<class QtGradientDialogPrivate> d_ptr;
    8080    Q_DECLARE_PRIVATE(QtGradientDialog)
    8181    Q_DISABLE_COPY(QtGradientDialog)

  • trunk/tools/shared/qtgradienteditor/qtgradientdialog.ui

    r2 r561  
    33**
    44** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    5 ** Contact: Qt Software Information (qt-info@nokia.com)
     5** All rights reserved.
     6** Contact: Nokia Corporation (qt-info@nokia.com)
    67**
    78** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2223** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2324**
    24 ** In addition, as a special exception, Nokia gives you certain
    25 ** additional rights. These rights are described in the Nokia Qt LGPL
    26 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    27 ** package.
     25** In addition, as a special exception, Nokia gives you certain additional
     26** rights.  These rights are described in the Nokia Qt LGPL Exception
     27** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2828**
    2929** GNU General Public License Usage
    … …  
    3535** met: http://www.gnu.org/copyleft/gpl.html.
    3636**
    37 ** If you are unsure which license is appropriate for your use, please
    38 ** contact the sales department at qt-sales@nokia.com.
     37** If you have questions regarding the use of this file, please contact
     38** Nokia at qt-info@nokia.com.
    3939** $QT_END_LICENSE$
    4040**

  • trunk/tools/shared/qtgradienteditor/qtgradienteditor.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**
    4040****************************************************************************/
    41 
    42 /*
    43 TRANSLATOR qdesigner_internal::QtGradientEditor
    44 */
    4541
    4642#include "qtgradienteditor.h"
    … …  
    728724
    729725QtGradientEditor::QtGradientEditor(QWidget *parent)
    730     : QWidget(parent)
    731 {
    732     d_ptr = new QtGradientEditorPrivate();
     726    : QWidget(parent), d_ptr(new QtGradientEditorPrivate())
     727{
    733728    d_ptr->q_ptr = this;
    734729    d_ptr->m_type = QGradient::RadialGradient;
    … …  
    766761
    767762    connect(d_ptr->m_ui.detailsButton, SIGNAL(clicked(bool)), this, SLOT(slotDetailsChanged(bool)));
    768     connect(d_ptr->m_gradientStopsController, SIGNAL(gradientStopsChanged(const QGradientStops &)),
    769                 this, SLOT(slotGradientStopsChanged(const QGradientStops &)));
     763    connect(d_ptr->m_gradientStopsController, SIGNAL(gradientStopsChanged(QGradientStops)),
     764                this, SLOT(slotGradientStopsChanged(QGradientStops)));
    770765
    771766    QIcon iconLinear(QLatin1String(":/trolltech/qtgradienteditor/images/typelinear.png"));
    … …  
    812807                this, SLOT(slotSpreadChanged(int)));
    813808
    814     connect(d_ptr->m_ui.gradientWidget, SIGNAL(startLinearChanged(const QPointF &)),
    815                 this, SLOT(startLinearChanged(const QPointF &)));
    816     connect(d_ptr->m_ui.gradientWidget, SIGNAL(endLinearChanged(const QPointF &)),
    817                 this, SLOT(endLinearChanged(const QPointF &)));
    818     connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralRadialChanged(const QPointF &)),
    819                 this, SLOT(centralRadialChanged(const QPointF &)));
    820     connect(d_ptr->m_ui.gradientWidget, SIGNAL(focalRadialChanged(const QPointF &)),
    821                 this, SLOT(focalRadialChanged(const QPointF &)));
     809    connect(d_ptr->m_ui.gradientWidget, SIGNAL(startLinearChanged(QPointF)),
     810                this, SLOT(startLinearChanged(QPointF)));
     811    connect(d_ptr->m_ui.gradientWidget, SIGNAL(endLinearChanged(QPointF)),
     812                this, SLOT(endLinearChanged(QPointF)));
     813    connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralRadialChanged(QPointF)),
     814                this, SLOT(centralRadialChanged(QPointF)));
     815    connect(d_ptr->m_ui.gradientWidget, SIGNAL(focalRadialChanged(QPointF)),
     816                this, SLOT(focalRadialChanged(QPointF)));
    822817    connect(d_ptr->m_ui.gradientWidget, SIGNAL(radiusRadialChanged(qreal)),
    823818                this, SLOT(radiusRadialChanged(qreal)));
    824     connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralConicalChanged(const QPointF &)),
    825                 this, SLOT(centralConicalChanged(const QPointF &)));
     819    connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralConicalChanged(QPointF)),
     820                this, SLOT(centralConicalChanged(QPointF)));
    826821    connect(d_ptr->m_ui.gradientWidget, SIGNAL(angleConicalChanged(qreal)),
    827822                this, SLOT(angleConicalChanged(qreal)));
    … …  
    836831    if (d_ptr->m_hiddenWidget)
    837832        delete d_ptr->m_hiddenWidget;
    838     delete d_ptr;
    839833}
    840834

  • trunk/tools/shared/qtgradienteditor/qtgradienteditor.h

    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**
    … …  
    7979
    8080private:
    81     class QtGradientEditorPrivate *d_ptr;
     81    QScopedPointer<class QtGradientEditorPrivate> d_ptr;
    8282    Q_DECLARE_PRIVATE(QtGradientEditor)
    8383    Q_DISABLE_COPY(QtGradientEditor)

  • trunk/tools/shared/qtgradienteditor/qtgradienteditor.ui

    r2 r561  
    33**
    44** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    5 ** Contact: Qt Software Information (qt-info@nokia.com)
     5** All rights reserved.
     6** Contact: Nokia Corporation (qt-info@nokia.com)
    67**
    78** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2223** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2324**
    24 ** In addition, as a special exception, Nokia gives you certain
    25 ** additional rights. These rights are described in the Nokia Qt LGPL
    26 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    27 ** package.
     25** In addition, as a special exception, Nokia gives you certain additional
     26** rights.  These rights are described in the Nokia Qt LGPL Exception
     27** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2828**
    2929** GNU General Public License Usage
    … …  
    3535** met: http://www.gnu.org/copyleft/gpl.html.
    3636**
    37 ** If you are unsure which license is appropriate for your use, please
    38 ** contact the sales department at qt-sales@nokia.com.
     37** If you have questions regarding the use of this file, please contact
     38** Nokia at qt-info@nokia.com.
    3939** $QT_END_LICENSE$
    4040**

  • trunk/tools/shared/qtgradienteditor/qtgradientmanager.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**

  • trunk/tools/shared/qtgradienteditor/qtgradientmanager.h

    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**

  • trunk/tools/shared/qtgradienteditor/qtgradientstopscontroller.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**
    4040****************************************************************************/
    41 
    42 /*
    43 TRANSLATOR qdesigner_internal::QtGradientStopsController
    44 */
    4541
    4642#include "qtgradientstopscontroller.h"
    … …  
    595591
    596592QtGradientStopsController::QtGradientStopsController(QObject *parent)
    597     : QObject(parent)
    598 {
    599     d_ptr = new QtGradientStopsControllerPrivate();
     593    : QObject(parent), d_ptr(new QtGradientStopsControllerPrivate())
     594{
    600595    d_ptr->q_ptr = this;
    601596
    … …  
    614609    d_ptr->m_model = new QtGradientStopsModel(this);
    615610    d_ptr->m_ui->gradientStopsWidget->setGradientStopsModel(d_ptr->m_model);
    616     connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
    617                 this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
    618     connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
    619                 this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
    620     connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
    621                 this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
    622     connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
    623                 this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
    624     connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
    625                 this, SLOT(slotStopSelected(QtGradientStop *, bool)));
    626     connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
    627                 this, SLOT(slotStopAdded(QtGradientStop *)));
    628     connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
    629                 this, SLOT(slotStopRemoved(QtGradientStop *)));
    630 
    631     connect(d_ptr->m_ui->hueColorLine, SIGNAL(colorChanged(const QColor &)),
    632                 this, SLOT(slotChangeHue(const QColor &)));
    633     connect(d_ptr->m_ui->saturationColorLine, SIGNAL(colorChanged(const QColor &)),
    634                 this, SLOT(slotChangeSaturation(const QColor &)));
    635     connect(d_ptr->m_ui->valueColorLine, SIGNAL(colorChanged(const QColor &)),
    636                 this, SLOT(slotChangeValue(const QColor &)));
    637     connect(d_ptr->m_ui->alphaColorLine, SIGNAL(colorChanged(const QColor &)),
    638                 this, SLOT(slotChangeAlpha(const QColor &)));
    639     connect(d_ptr->m_ui->colorButton, SIGNAL(colorChanged(const QColor &)),
    640                 this, SLOT(slotChangeColor(const QColor &)));
     611    connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop*)),
     612                this, SLOT(slotCurrentStopChanged(QtGradientStop*)));
     613    connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop*,qreal)),
     614                this, SLOT(slotStopMoved(QtGradientStop*,qreal)));
     615    connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop*,QtGradientStop*)),
     616                this, SLOT(slotStopsSwapped(QtGradientStop*,QtGradientStop*)));
     617    connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop*,QColor)),
     618                this, SLOT(slotStopChanged(QtGradientStop*,QColor)));
     619    connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop*,bool)),
     620                this, SLOT(slotStopSelected(QtGradientStop*,bool)));
     621    connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop*)),
     622                this, SLOT(slotStopAdded(QtGradientStop*)));
     623    connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop*)),
     624                this, SLOT(slotStopRemoved(QtGradientStop*)));
     625
     626    connect(d_ptr->m_ui->hueColorLine, SIGNAL(colorChanged(QColor)),
     627                this, SLOT(slotChangeHue(QColor)));
     628    connect(d_ptr->m_ui->saturationColorLine, SIGNAL(colorChanged(QColor)),
     629                this, SLOT(slotChangeSaturation(QColor)));
     630    connect(d_ptr->m_ui->valueColorLine, SIGNAL(colorChanged(QColor)),
     631                this, SLOT(slotChangeValue(QColor)));
     632    connect(d_ptr->m_ui->alphaColorLine, SIGNAL(colorChanged(QColor)),
     633                this, SLOT(slotChangeAlpha(QColor)));
     634    connect(d_ptr->m_ui->colorButton, SIGNAL(colorChanged(QColor)),
     635                this, SLOT(slotChangeColor(QColor)));
    641636
    642637    connect(d_ptr->m_ui->hueSpinBox, SIGNAL(valueChanged(int)),
    … …  
    676671QtGradientStopsController::~QtGradientStopsController()
    677672{
    678     delete d_ptr;
    679673}
    680674

  • trunk/tools/shared/qtgradienteditor/qtgradientstopscontroller.h

    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**
    … …  
    7171
    7272private:
    73     class QtGradientStopsControllerPrivate *d_ptr;
     73    QScopedPointer<class QtGradientStopsControllerPrivate> d_ptr;
    7474    Q_DECLARE_PRIVATE(QtGradientStopsController)
    7575    Q_DISABLE_COPY(QtGradientStopsController)

  • trunk/tools/shared/qtgradienteditor/qtgradientstopsmodel.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**
    … …  
    7979
    8080QtGradientStop::QtGradientStop(QtGradientStopsModel *model)
    81 {
    82     d_ptr = new QtGradientStopPrivate();
     81    : d_ptr(new QtGradientStopPrivate())
     82{
    8383    d_ptr->m_position = 0;
    8484    d_ptr->m_color = Qt::white;
    … …  
    8888QtGradientStop::~QtGradientStop()
    8989{
    90     delete d_ptr;
    9190}
    9291
    … …  
    105104
    106105QtGradientStopsModel::QtGradientStopsModel(QObject *parent)
    107     : QObject(parent)
    108 {
    109     d_ptr = new QtGradientStopsModelPrivate;
     106    : QObject(parent), d_ptr(new QtGradientStopsModelPrivate)
     107{
    110108    d_ptr->q_ptr = this;
    111109    d_ptr->m_current = 0;
    … …  
    115113{
    116114    clear();
    117     delete d_ptr;
    118115}
    119116

  • trunk/tools/shared/qtgradienteditor/qtgradientstopsmodel.h

    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**
    … …  
    6565    QtGradientStop(QtGradientStopsModel *model = 0);
    6666    ~QtGradientStop();
    67     class QtGradientStopPrivate *d_ptr;
     67    QScopedPointer<class QtGradientStopPrivate> d_ptr;
    6868};
    6969
    … …  
    112112
    113113private:
    114     class QtGradientStopsModelPrivate *d_ptr;
     114    QScopedPointer<class QtGradientStopsModelPrivate> d_ptr;
    115115    Q_DECLARE_PRIVATE(QtGradientStopsModel)
    116116    Q_DISABLE_COPY(QtGradientStopsModel)

  • trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.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**
    … …  
    361361
    362362QtGradientStopsWidget::QtGradientStopsWidget(QWidget *parent)
    363     : QAbstractScrollArea(parent)
    364 {
    365     d_ptr = new QtGradientStopsWidgetPrivate;
     363    : QAbstractScrollArea(parent), d_ptr(new QtGradientStopsWidgetPrivate)
     364{
    366365    d_ptr->q_ptr = this;
    367366    d_ptr->m_backgroundCheckered = true;
    … …  
    392391QtGradientStopsWidget::~QtGradientStopsWidget()
    393392{
    394     delete d_ptr;
    395393}
    396394
    … …  
    424422
    425423    if (d_ptr->m_model) {
    426         disconnect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
    427                     this, SLOT(slotStopAdded(QtGradientStop *)));
    428         disconnect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
    429                     this, SLOT(slotStopRemoved(QtGradientStop *)));
    430         disconnect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
    431                     this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
    432         disconnect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
    433                     this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
    434         disconnect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
    435                     this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
    436         disconnect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
    437                     this, SLOT(slotStopSelected(QtGradientStop *, bool)));
    438         disconnect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
    439                     this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
     424        disconnect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop*)),
     425                    this, SLOT(slotStopAdded(QtGradientStop*)));
     426        disconnect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop*)),
     427                    this, SLOT(slotStopRemoved(QtGradientStop*)));
     428        disconnect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop*,qreal)),
     429                    this, SLOT(slotStopMoved(QtGradientStop*,qreal)));
     430        disconnect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop*,QtGradientStop*)),
     431                    this, SLOT(slotStopsSwapped(QtGradientStop*,QtGradientStop*)));
     432        disconnect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop*,QColor)),
     433                    this, SLOT(slotStopChanged(QtGradientStop*,QColor)));
     434        disconnect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop*,bool)),
     435                    this, SLOT(slotStopSelected(QtGradientStop*,bool)));
     436        disconnect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop*)),
     437                    this, SLOT(slotCurrentStopChanged(QtGradientStop*)));
    440438
    441439        d_ptr->m_stops.clear();
    … …  
    445443
    446444    if (d_ptr->m_model) {
    447         connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
    448                     this, SLOT(slotStopAdded(QtGradientStop *)));
    449         connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
    450                     this, SLOT(slotStopRemoved(QtGradientStop *)));
    451         connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
    452                     this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
    453         connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
    454                     this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
    455         connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
    456                     this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
    457         connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
    458                     this, SLOT(slotStopSelected(QtGradientStop *, bool)));
    459         connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
    460                     this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
     445        connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop*)),
     446                    this, SLOT(slotStopAdded(QtGradientStop*)));
     447        connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop*)),
     448                    this, SLOT(slotStopRemoved(QtGradientStop*)));
     449        connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop*,qreal)),
     450                    this, SLOT(slotStopMoved(QtGradientStop*,qreal)));
     451        connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop*,QtGradientStop*)),
     452                    this, SLOT(slotStopsSwapped(QtGradientStop*,QtGradientStop*)));
     453        connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop*,QColor)),
     454                    this, SLOT(slotStopChanged(QtGradientStop*,QColor)));
     455        connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop*,bool)),
     456                    this, SLOT(slotStopSelected(QtGradientStop*,bool)));
     457        connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop*)),
     458                    this, SLOT(slotCurrentStopChanged(QtGradientStop*)));
    461459
    462460        QList<QtGradientStop *> stops = d_ptr->m_model->stops().values();

  • trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.h

    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**
    … …  
    9292
    9393private:
    94     QtGradientStopsWidgetPrivate *d_ptr;
     94    QScopedPointer<QtGradientStopsWidgetPrivate> d_ptr;
    9595    Q_DECLARE_PRIVATE(QtGradientStopsWidget)
    9696    Q_DISABLE_COPY(QtGradientStopsWidget)

  • trunk/tools/shared/qtgradienteditor/qtgradientutils.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**

  • trunk/tools/shared/qtgradienteditor/qtgradientutils.h

    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**

  • trunk/tools/shared/qtgradienteditor/qtgradientview.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**
    … …  
    202202    m_ui.listWidget->viewport()->setPalette(pal);
    203203
    204     connect(m_ui.listWidget, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(slotGradientActivated(QListWidgetItem *)));
    205     connect(m_ui.listWidget, SIGNAL(itemChanged(QListWidgetItem *)), this, SLOT(slotRenameGradient(QListWidgetItem *)));
    206     connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(slotCurrentItemChanged(QListWidgetItem *)));
     204    connect(m_ui.listWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(slotGradientActivated(QListWidgetItem*)));
     205    connect(m_ui.listWidget, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(slotRenameGradient(QListWidgetItem*)));
     206    connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(slotCurrentItemChanged(QListWidgetItem*)));
    207207
    208208    m_newAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/plus.png")), tr("New..."), this);
    … …  
    235235
    236236    if (m_manager) {
    237         disconnect(m_manager, SIGNAL(gradientAdded(const QString &, const QGradient &)),
    238                     this, SLOT(slotGradientAdded(const QString &, const QGradient &)));
    239         disconnect(m_manager, SIGNAL(gradientRenamed(const QString &, const QString &)),
    240                     this, SLOT(slotGradientRenamed(const QString &, const QString &)));
    241         disconnect(m_manager, SIGNAL(gradientChanged(const QString &, const QGradient &)),
    242                     this, SLOT(slotGradientChanged(const QString &, const QGradient &)));
    243         disconnect(m_manager, SIGNAL(gradientRemoved(const QString &)),
    244                     this, SLOT(slotGradientRemoved(const QString &)));
     237        disconnect(m_manager, SIGNAL(gradientAdded(QString,QGradient)),
     238                    this, SLOT(slotGradientAdded(QString,QGradient)));
     239        disconnect(m_manager, SIGNAL(gradientRenamed(QString,QString)),
     240                    this, SLOT(slotGradientRenamed(QString,QString)));
     241        disconnect(m_manager, SIGNAL(gradientChanged(QString,QGradient)),
     242                    this, SLOT(slotGradientChanged(QString,QGradient)));
     243        disconnect(m_manager, SIGNAL(gradientRemoved(QString)),
     244                    this, SLOT(slotGradientRemoved(QString)));
    245245
    246246        m_ui.listWidget->clear();
    … …  
    261261    }
    262262
    263     connect(m_manager, SIGNAL(gradientAdded(const QString &, const QGradient &)),
    264             this, SLOT(slotGradientAdded(const QString &, const QGradient &)));
    265     connect(m_manager, SIGNAL(gradientRenamed(const QString &, const QString &)),
    266             this, SLOT(slotGradientRenamed(const QString &, const QString &)));
    267     connect(m_manager, SIGNAL(gradientChanged(const QString &, const QGradient &)),
    268             this, SLOT(slotGradientChanged(const QString &, const QGradient &)));
    269     connect(m_manager, SIGNAL(gradientRemoved(const QString &)),
    270             this, SLOT(slotGradientRemoved(const QString &)));
     263    connect(m_manager, SIGNAL(gradientAdded(QString,QGradient)),
     264            this, SLOT(slotGradientAdded(QString,QGradient)));
     265    connect(m_manager, SIGNAL(gradientRenamed(QString,QString)),
     266            this, SLOT(slotGradientRenamed(QString,QString)));
     267    connect(m_manager, SIGNAL(gradientChanged(QString,QGradient)),
     268            this, SLOT(slotGradientChanged(QString,QGradient)));
     269    connect(m_manager, SIGNAL(gradientRemoved(QString)),
     270            this, SLOT(slotGradientRemoved(QString)));
    271271}
    272272

  • trunk/tools/shared/qtgradienteditor/qtgradientview.h

    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**

  • trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.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**
    … …  
    5151    m_ui.setupUi(this);
    5252    m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
    53     connect(m_ui.gradientView, SIGNAL(currentGradientChanged(const QString &)),
    54             this, SLOT(slotGradientSelected(const QString &)));
    55     connect(m_ui.gradientView, SIGNAL(gradientActivated(const QString &)),
    56             this, SLOT(slotGradientActivated(const QString &)));
     53    connect(m_ui.gradientView, SIGNAL(currentGradientChanged(QString)),
     54            this, SLOT(slotGradientSelected(QString)));
     55    connect(m_ui.gradientView, SIGNAL(gradientActivated(QString)),
     56            this, SLOT(slotGradientActivated(QString)));
    5757}
    5858

  • trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.h

    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**

  • trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.ui

    r2 r561  
    33**
    44** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    5 ** Contact: Qt Software Information (qt-info@nokia.com)
     5** All rights reserved.
     6** Contact: Nokia Corporation (qt-info@nokia.com)
    67**
    78** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2223** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2324**
    24 ** In addition, as a special exception, Nokia gives you certain
    25 ** additional rights. These rights are described in the Nokia Qt LGPL
    26 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    27 ** package.
     25** In addition, as a special exception, Nokia gives you certain additional
     26** rights.  These rights are described in the Nokia Qt LGPL Exception
     27** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2828**
    2929** GNU General Public License Usage
    … …  
    3535** met: http://www.gnu.org/copyleft/gpl.html.
    3636**
    37 ** If you are unsure which license is appropriate for your use, please
    38 ** contact the sales department at qt-sales@nokia.com.
     37** If you have questions regarding the use of this file, please contact
     38** Nokia at qt-info@nokia.com.
    3939** $QT_END_LICENSE$
    4040**

  • trunk/tools/shared/qtgradienteditor/qtgradientwidget.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**
    … …  
    233233
    234234QtGradientWidget::QtGradientWidget(QWidget *parent)
    235     : QWidget(parent)
    236 {
    237     d_ptr = new QtGradientWidgetPrivate;
     235    : QWidget(parent), d_ptr(new QtGradientWidgetPrivate)
     236{
    238237    d_ptr->q_ptr = this;
    239238    d_ptr->m_backgroundCheckered = true;
    … …  
    254253QtGradientWidget::~QtGradientWidget()
    255254{
    256     delete d_ptr;
    257255}
    258256

  • trunk/tools/shared/qtgradienteditor/qtgradientwidget.h

    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**
    … …  
    111111
    112112private:
    113     class QtGradientWidgetPrivate *d_ptr;
     113    QScopedPointer<class QtGradientWidgetPrivate> d_ptr;
    114114    Q_DECLARE_PRIVATE(QtGradientWidget)
    115115    Q_DISABLE_COPY(QtGradientWidget)
Note: See TracChangeset for help on using the changeset viewer.