summaryrefslogtreecommitdiffstats
path: root/tools/shared/qtgradienteditor
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-18 16:23:15 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-18 16:41:44 (GMT)
commit9a0f7a1ef387a20f91a9b651b92d8eb345952f5f (patch)
tree53000f8dfb4d39dcbea691b283e5d54bf3cfcb50 /tools/shared/qtgradienteditor
parent6afb136b0462a5049c497831203a35173f64b9ae (diff)
downloadQt-9a0f7a1ef387a20f91a9b651b92d8eb345952f5f.zip
Qt-9a0f7a1ef387a20f91a9b651b92d8eb345952f5f.tar.gz
Qt-9a0f7a1ef387a20f91a9b651b92d8eb345952f5f.tar.bz2
Ran the script utils/normalize
Over src/ tools/ examples/ and demos/
Diffstat (limited to 'tools/shared/qtgradienteditor')
-rw-r--r--tools/shared/qtgradienteditor/qtgradientdialog.cpp4
-rw-r--r--tools/shared/qtgradienteditor/qtgradienteditor.cpp24
-rw-r--r--tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp50
-rw-r--r--tools/shared/qtgradienteditor/qtgradientstopswidget.cpp56
-rw-r--r--tools/shared/qtgradienteditor/qtgradientview.cpp38
-rw-r--r--tools/shared/qtgradienteditor/qtgradientviewdialog.cpp8
6 files changed, 90 insertions, 90 deletions
diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.cpp b/tools/shared/qtgradienteditor/qtgradientdialog.cpp
index d4685f1..d178829 100644
--- a/tools/shared/qtgradienteditor/qtgradientdialog.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientdialog.cpp
@@ -207,8 +207,8 @@ QtGradientDialog::QtGradientDialog(QWidget *parent)
button = d_ptr->m_ui.buttonBox->button(QDialogButtonBox::Cancel);
if (button)
button->setAutoDefault(false);
- connect(d_ptr->m_ui.gradientEditor, SIGNAL(aboutToShowDetails(bool, int)),
- this, SLOT(slotAboutToShowDetails(bool, int)));
+ connect(d_ptr->m_ui.gradientEditor, SIGNAL(aboutToShowDetails(bool,int)),
+ this, SLOT(slotAboutToShowDetails(bool,int)));
}
/*!
diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.cpp b/tools/shared/qtgradienteditor/qtgradienteditor.cpp
index 98dbdd6..d9b42be 100644
--- a/tools/shared/qtgradienteditor/qtgradienteditor.cpp
+++ b/tools/shared/qtgradienteditor/qtgradienteditor.cpp
@@ -760,8 +760,8 @@ QtGradientEditor::QtGradientEditor(QWidget *parent)
d_ptr->m_ui.detailsButton->setIcon(icon);
connect(d_ptr->m_ui.detailsButton, SIGNAL(clicked(bool)), this, SLOT(slotDetailsChanged(bool)));
- connect(d_ptr->m_gradientStopsController, SIGNAL(gradientStopsChanged(const QGradientStops &)),
- this, SLOT(slotGradientStopsChanged(const QGradientStops &)));
+ connect(d_ptr->m_gradientStopsController, SIGNAL(gradientStopsChanged(QGradientStops)),
+ this, SLOT(slotGradientStopsChanged(QGradientStops)));
QIcon iconLinear(QLatin1String(":/trolltech/qtgradienteditor/images/typelinear.png"));
QIcon iconRadial(QLatin1String(":/trolltech/qtgradienteditor/images/typeradial.png"));
@@ -806,18 +806,18 @@ QtGradientEditor::QtGradientEditor(QWidget *parent)
connect(d_ptr->m_ui.spreadComboBox, SIGNAL(activated(int)),
this, SLOT(slotSpreadChanged(int)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(startLinearChanged(const QPointF &)),
- this, SLOT(startLinearChanged(const QPointF &)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(endLinearChanged(const QPointF &)),
- this, SLOT(endLinearChanged(const QPointF &)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralRadialChanged(const QPointF &)),
- this, SLOT(centralRadialChanged(const QPointF &)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(focalRadialChanged(const QPointF &)),
- this, SLOT(focalRadialChanged(const QPointF &)));
+ connect(d_ptr->m_ui.gradientWidget, SIGNAL(startLinearChanged(QPointF)),
+ this, SLOT(startLinearChanged(QPointF)));
+ connect(d_ptr->m_ui.gradientWidget, SIGNAL(endLinearChanged(QPointF)),
+ this, SLOT(endLinearChanged(QPointF)));
+ connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralRadialChanged(QPointF)),
+ this, SLOT(centralRadialChanged(QPointF)));
+ connect(d_ptr->m_ui.gradientWidget, SIGNAL(focalRadialChanged(QPointF)),
+ this, SLOT(focalRadialChanged(QPointF)));
connect(d_ptr->m_ui.gradientWidget, SIGNAL(radiusRadialChanged(qreal)),
this, SLOT(radiusRadialChanged(qreal)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralConicalChanged(const QPointF &)),
- this, SLOT(centralConicalChanged(const QPointF &)));
+ connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralConicalChanged(QPointF)),
+ this, SLOT(centralConicalChanged(QPointF)));
connect(d_ptr->m_ui.gradientWidget, SIGNAL(angleConicalChanged(qreal)),
this, SLOT(angleConicalChanged(qreal)));
diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp b/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
index be707d4..b2765b5 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
@@ -608,31 +608,31 @@ void QtGradientStopsController::setUi(Ui::QtGradientEditor *ui)
d_ptr->m_model = new QtGradientStopsModel(this);
d_ptr->m_ui->gradientStopsWidget->setGradientStopsModel(d_ptr->m_model);
- connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
- this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
- this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
- connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
- this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
- this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
- connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
- this, SLOT(slotStopSelected(QtGradientStop *, bool)));
- connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
- this, SLOT(slotStopAdded(QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
- this, SLOT(slotStopRemoved(QtGradientStop *)));
-
- connect(d_ptr->m_ui->hueColorLine, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeHue(const QColor &)));
- connect(d_ptr->m_ui->saturationColorLine, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeSaturation(const QColor &)));
- connect(d_ptr->m_ui->valueColorLine, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeValue(const QColor &)));
- connect(d_ptr->m_ui->alphaColorLine, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeAlpha(const QColor &)));
- connect(d_ptr->m_ui->colorButton, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeColor(const QColor &)));
+ connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop*)),
+ this, SLOT(slotCurrentStopChanged(QtGradientStop*)));
+ connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop*,qreal)),
+ this, SLOT(slotStopMoved(QtGradientStop*,qreal)));
+ connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop*,QtGradientStop*)),
+ this, SLOT(slotStopsSwapped(QtGradientStop*,QtGradientStop*)));
+ connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop*,QColor)),
+ this, SLOT(slotStopChanged(QtGradientStop*,QColor)));
+ connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop*,bool)),
+ this, SLOT(slotStopSelected(QtGradientStop*,bool)));
+ connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop*)),
+ this, SLOT(slotStopAdded(QtGradientStop*)));
+ connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop*)),
+ this, SLOT(slotStopRemoved(QtGradientStop*)));
+
+ connect(d_ptr->m_ui->hueColorLine, SIGNAL(colorChanged(QColor)),
+ this, SLOT(slotChangeHue(QColor)));
+ connect(d_ptr->m_ui->saturationColorLine, SIGNAL(colorChanged(QColor)),
+ this, SLOT(slotChangeSaturation(QColor)));
+ connect(d_ptr->m_ui->valueColorLine, SIGNAL(colorChanged(QColor)),
+ this, SLOT(slotChangeValue(QColor)));
+ connect(d_ptr->m_ui->alphaColorLine, SIGNAL(colorChanged(QColor)),
+ this, SLOT(slotChangeAlpha(QColor)));
+ connect(d_ptr->m_ui->colorButton, SIGNAL(colorChanged(QColor)),
+ this, SLOT(slotChangeColor(QColor)));
connect(d_ptr->m_ui->hueSpinBox, SIGNAL(valueChanged(int)),
this, SLOT(slotChangeHue(int)));
diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp b/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
index 94e936a..411dbed 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
@@ -421,20 +421,20 @@ void QtGradientStopsWidget::setGradientStopsModel(QtGradientStopsModel *model)
return;
if (d_ptr->m_model) {
- disconnect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
- this, SLOT(slotStopAdded(QtGradientStop *)));
- disconnect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
- this, SLOT(slotStopRemoved(QtGradientStop *)));
- disconnect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
- this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
- disconnect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
- this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
- disconnect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
- this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
- disconnect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
- this, SLOT(slotStopSelected(QtGradientStop *, bool)));
- disconnect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
- this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
+ disconnect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop*)),
+ this, SLOT(slotStopAdded(QtGradientStop*)));
+ disconnect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop*)),
+ this, SLOT(slotStopRemoved(QtGradientStop*)));
+ disconnect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop*,qreal)),
+ this, SLOT(slotStopMoved(QtGradientStop*,qreal)));
+ disconnect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop*,QtGradientStop*)),
+ this, SLOT(slotStopsSwapped(QtGradientStop*,QtGradientStop*)));
+ disconnect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop*,QColor)),
+ this, SLOT(slotStopChanged(QtGradientStop*,QColor)));
+ disconnect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop*,bool)),
+ this, SLOT(slotStopSelected(QtGradientStop*,bool)));
+ disconnect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop*)),
+ this, SLOT(slotCurrentStopChanged(QtGradientStop*)));
d_ptr->m_stops.clear();
}
@@ -442,20 +442,20 @@ void QtGradientStopsWidget::setGradientStopsModel(QtGradientStopsModel *model)
d_ptr->m_model = model;
if (d_ptr->m_model) {
- connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
- this, SLOT(slotStopAdded(QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
- this, SLOT(slotStopRemoved(QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
- this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
- connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
- this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
- this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
- connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
- this, SLOT(slotStopSelected(QtGradientStop *, bool)));
- connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
- this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
+ connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop*)),
+ this, SLOT(slotStopAdded(QtGradientStop*)));
+ connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop*)),
+ this, SLOT(slotStopRemoved(QtGradientStop*)));
+ connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop*,qreal)),
+ this, SLOT(slotStopMoved(QtGradientStop*,qreal)));
+ connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop*,QtGradientStop*)),
+ this, SLOT(slotStopsSwapped(QtGradientStop*,QtGradientStop*)));
+ connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop*,QColor)),
+ this, SLOT(slotStopChanged(QtGradientStop*,QColor)));
+ connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop*,bool)),
+ this, SLOT(slotStopSelected(QtGradientStop*,bool)));
+ connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop*)),
+ this, SLOT(slotCurrentStopChanged(QtGradientStop*)));
QList<QtGradientStop *> stops = d_ptr->m_model->stops().values();
QListIterator<QtGradientStop *> itStop(stops);
diff --git a/tools/shared/qtgradienteditor/qtgradientview.cpp b/tools/shared/qtgradienteditor/qtgradientview.cpp
index 4df42b4..c9d8aac 100644
--- a/tools/shared/qtgradienteditor/qtgradientview.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientview.cpp
@@ -201,9 +201,9 @@ QtGradientView::QtGradientView(QWidget *parent)
pal.setBrush(QPalette::Base, QBrush(pm));
m_ui.listWidget->viewport()->setPalette(pal);
- connect(m_ui.listWidget, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(slotGradientActivated(QListWidgetItem *)));
- connect(m_ui.listWidget, SIGNAL(itemChanged(QListWidgetItem *)), this, SLOT(slotRenameGradient(QListWidgetItem *)));
- connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(slotCurrentItemChanged(QListWidgetItem *)));
+ connect(m_ui.listWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(slotGradientActivated(QListWidgetItem*)));
+ connect(m_ui.listWidget, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(slotRenameGradient(QListWidgetItem*)));
+ connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(slotCurrentItemChanged(QListWidgetItem*)));
m_newAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/plus.png")), tr("New..."), this);
m_editAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/edit.png")), tr("Edit..."), this);
@@ -234,14 +234,14 @@ void QtGradientView::setGradientManager(QtGradientManager *manager)
return;
if (m_manager) {
- disconnect(m_manager, SIGNAL(gradientAdded(const QString &, const QGradient &)),
- this, SLOT(slotGradientAdded(const QString &, const QGradient &)));
- disconnect(m_manager, SIGNAL(gradientRenamed(const QString &, const QString &)),
- this, SLOT(slotGradientRenamed(const QString &, const QString &)));
- disconnect(m_manager, SIGNAL(gradientChanged(const QString &, const QGradient &)),
- this, SLOT(slotGradientChanged(const QString &, const QGradient &)));
- disconnect(m_manager, SIGNAL(gradientRemoved(const QString &)),
- this, SLOT(slotGradientRemoved(const QString &)));
+ disconnect(m_manager, SIGNAL(gradientAdded(QString,QGradient)),
+ this, SLOT(slotGradientAdded(QString,QGradient)));
+ disconnect(m_manager, SIGNAL(gradientRenamed(QString,QString)),
+ this, SLOT(slotGradientRenamed(QString,QString)));
+ disconnect(m_manager, SIGNAL(gradientChanged(QString,QGradient)),
+ this, SLOT(slotGradientChanged(QString,QGradient)));
+ disconnect(m_manager, SIGNAL(gradientRemoved(QString)),
+ this, SLOT(slotGradientRemoved(QString)));
m_ui.listWidget->clear();
m_idToItem.clear();
@@ -260,14 +260,14 @@ void QtGradientView::setGradientManager(QtGradientManager *manager)
slotGradientAdded(itGrad.key(), itGrad.value());
}
- connect(m_manager, SIGNAL(gradientAdded(const QString &, const QGradient &)),
- this, SLOT(slotGradientAdded(const QString &, const QGradient &)));
- connect(m_manager, SIGNAL(gradientRenamed(const QString &, const QString &)),
- this, SLOT(slotGradientRenamed(const QString &, const QString &)));
- connect(m_manager, SIGNAL(gradientChanged(const QString &, const QGradient &)),
- this, SLOT(slotGradientChanged(const QString &, const QGradient &)));
- connect(m_manager, SIGNAL(gradientRemoved(const QString &)),
- this, SLOT(slotGradientRemoved(const QString &)));
+ connect(m_manager, SIGNAL(gradientAdded(QString,QGradient)),
+ this, SLOT(slotGradientAdded(QString,QGradient)));
+ connect(m_manager, SIGNAL(gradientRenamed(QString,QString)),
+ this, SLOT(slotGradientRenamed(QString,QString)));
+ connect(m_manager, SIGNAL(gradientChanged(QString,QGradient)),
+ this, SLOT(slotGradientChanged(QString,QGradient)));
+ connect(m_manager, SIGNAL(gradientRemoved(QString)),
+ this, SLOT(slotGradientRemoved(QString)));
}
QtGradientManager *QtGradientView::gradientManager() const
diff --git a/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp b/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
index 0eff338..6f3d88a 100644
--- a/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
@@ -50,10 +50,10 @@ QtGradientViewDialog::QtGradientViewDialog(QWidget *parent)
{
m_ui.setupUi(this);
m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
- connect(m_ui.gradientView, SIGNAL(currentGradientChanged(const QString &)),
- this, SLOT(slotGradientSelected(const QString &)));
- connect(m_ui.gradientView, SIGNAL(gradientActivated(const QString &)),
- this, SLOT(slotGradientActivated(const QString &)));
+ connect(m_ui.gradientView, SIGNAL(currentGradientChanged(QString)),
+ this, SLOT(slotGradientSelected(QString)));
+ connect(m_ui.gradientView, SIGNAL(gradientActivated(QString)),
+ this, SLOT(slotGradientActivated(QString)));
}
void QtGradientViewDialog::setGradientManager(QtGradientManager *manager)