X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=9fab60cbeaea599ea8307944fb73b58c0994d31c;hp=a87717212a2e9922b56b74f95e3f374fe4e70568;hb=580662426b8b734566b37de61deccf5b89970c6e;hpb=745f33ace5377addd6fec7991db594dd8c64984d diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index a8771721..9fab60cb 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2010 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -85,9 +85,9 @@ InputWidget::InputWidget(QWidget *parent) _colorFillMenu->addAction(pix, tr("Clear Color"))->setData(""); ui.textcolorButton->setMenu(_colorMenu); - connect(_colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorChoosen(QAction*))); + connect(_colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorChosen(QAction*))); ui.highlightcolorButton->setMenu(_colorFillMenu); - connect(_colorFillMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorHighlightChoosen(QAction*))); + connect(_colorFillMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorHighlightChosen(QAction*))); new TabCompleter(ui.inputEdit); @@ -432,7 +432,7 @@ void InputWidget::fontChanged(const QFont &f) ui.underlineButton->setChecked(f.underline()); } -void InputWidget::colorChoosen(QAction * action) { +void InputWidget::colorChosen(QAction *action) { QTextCharFormat fmt; QColor color; if (qVariantValue(action->data()) == "") { @@ -450,7 +450,7 @@ void InputWidget::colorChoosen(QAction * action) { ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), color)); } -void InputWidget::colorHighlightChoosen(QAction * action) { +void InputWidget::colorHighlightChosen(QAction *action) { QTextCharFormat fmt; QColor color; if (qVariantValue(action->data()) == "") { @@ -496,7 +496,7 @@ void InputWidget::on_showStyleButton_toggled(bool checked) { } } -QIcon InputWidget::createColorToolButtonIcon(const QIcon &icon, QColor color) { +QIcon InputWidget::createColorToolButtonIcon(const QIcon &icon, const QColor &color) { QPixmap pixmap(16, 16); pixmap.fill(Qt::transparent); QPainter painter(&pixmap);