← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to kdeui/colors/kcolordialog.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Kolberg
  • Date: 2012-03-03 00:25:28 UTC
  • mfrom: (1.14.15)
  • Revision ID: package-import@ubuntu.com-20120303002528-chhwyfluldkicy5k
Tags: 4:4.8.1-0ubuntu1
* New upstream release
  - Update symbol files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdeui/colors/kcolordialog.cpp
584
584
    d->mNamedColorList->setFixedSize(minSize);
585
585
    d->mNamedColorList->hide();
586
586
    layout->addWidget(d->mNamedColorList);
587
 
    connect(d->mNamedColorList, SIGNAL(currentTextChanged(const QString &)),
588
 
            this, SLOT(slotColorTextSelected(const QString &)));
 
587
    connect(d->mNamedColorList, SIGNAL(currentTextChanged(QString)),
 
588
            this, SLOT(slotColorTextSelected(QString)));
589
589
 
590
590
    setFixedSize(sizeHint());
591
 
    connect(d->combo, SIGNAL(activated(const QString &)),
592
 
            this, SLOT(slotSetColors(const QString &)));
 
591
    connect(d->combo, SIGNAL(activated(QString)),
 
592
            this, SLOT(slotSetColors(QString)));
593
593
}
594
594
 
595
595
KColorTable::~KColorTable()
834
834
            for (int i = 0; i < d->mPalette->count(); i++) {
835
835
                d->cells->setColor(i, d->mPalette->color(i));
836
836
            }
837
 
            connect(d->cells, SIGNAL(colorSelected(int , const QColor&)),
838
 
                    SLOT(slotColorCellSelected(int , const QColor&)));
839
 
            connect(d->cells, SIGNAL(colorDoubleClicked(int , const QColor&)),
840
 
                    SLOT(slotColorCellDoubleClicked(int , const QColor&)));
 
837
            connect(d->cells, SIGNAL(colorSelected(int,QColor)),
 
838
                    SLOT(slotColorCellSelected(int,QColor)));
 
839
            connect(d->cells, SIGNAL(colorDoubleClicked(int,QColor)),
 
840
                    SLOT(slotColorCellDoubleClicked(int,QColor)));
841
841
            d->sv->setWidget(d->cells);
842
842
            d->cells->show();
843
843
 
1022
1022
#endif
1023
1023
    d->cbDefaultColor = 0L;
1024
1024
    d->_mode = ChooserClassic;
1025
 
    connect(this, SIGNAL(okClicked(void)), this, SLOT(slotWriteSettings(void)));
1026
 
    connect(this, SIGNAL(closeClicked(void)), this, SLOT(slotWriteSettings(void)));
 
1025
    connect(this, SIGNAL(okClicked()), this, SLOT(slotWriteSettings()));
 
1026
    connect(this, SIGNAL(closeClicked()), this, SLOT(slotWriteSettings()));
1027
1027
 
1028
1028
    QLabel *label;
1029
1029
 
1058
1058
    d->hsSelector = new KHueSaturationSelector(page);
1059
1059
    d->hsSelector->setMinimumSize(256, 256);
1060
1060
    l_ltop->addWidget(d->hsSelector, 8);
1061
 
    connect(d->hsSelector, SIGNAL(valueChanged(int, int)),
1062
 
            SLOT(slotHSChanged(int, int)));
 
1061
    connect(d->hsSelector, SIGNAL(valueChanged(int,int)),
 
1062
            SLOT(slotHSChanged(int,int)));
1063
1063
 
1064
1064
    d->valuePal = new KColorValueSelector(page);
1065
1065
    d->valuePal->setMinimumSize(26, 70);
1192
1192
    d->table = new KColorTable(page);
1193
1193
    d->l_right->addWidget(d->table, 10);
1194
1194
 
1195
 
    connect(d->table, SIGNAL(colorSelected(const QColor &, const QString &)),
1196
 
            SLOT(slotColorSelected(const QColor &, const QString &)));
 
1195
    connect(d->table, SIGNAL(colorSelected(QColor,QString)),
 
1196
            SLOT(slotColorSelected(QColor,QString)));
1197
1197
 
1198
1198
    connect(
1199
1199
        d->table,
1200
 
        SIGNAL(colorDoubleClicked(const QColor &, const QString &)),
1201
 
        SLOT(slotColorDoubleClicked(const QColor &, const QString &))
 
1200
        SIGNAL(colorDoubleClicked(QColor,QString)),
 
1201
        SLOT(slotColorDoubleClicked(QColor,QString))
1202
1202
    );
1203
1203
    // Store the default value for saving time.
1204
1204
    d->originalPalette = d->table->name();
1260
1260
    d->htmlName->setFixedWidth(w);
1261
1261
    l_grid->addWidget(d->htmlName, 1, 2, Qt::AlignLeft);
1262
1262
 
1263
 
    connect(d->htmlName, SIGNAL(textChanged(const QString &)),
 
1263
    connect(d->htmlName, SIGNAL(textChanged(QString)),
1264
1264
            SLOT(slotHtmlChanged()));
1265
1265
 
1266
1266
    d->patch = new KColorPatch(page);
1267
1267
    d->patch->setFixedSize(48, 48);
1268
1268
    l_grid->addWidget(d->patch, 0, 0, 2, 1, Qt::AlignHCenter | Qt::AlignVCenter);
1269
 
    connect(d->patch, SIGNAL(colorChanged(const QColor&)),
1270
 
            SLOT(setColor(const QColor&)));
 
1269
    connect(d->patch, SIGNAL(colorChanged(QColor)),
 
1270
            SLOT(setColor(QColor)));
1271
1271
 
1272
1272
    //
1273
1273
    // chain fields together