#include "qtui.h"
#include "qtuisettings.h"
#include "tabcompleter.h"
+#include "util.h"
const int leftMargin = 3;
_networkId(0)
{
ui.setupUi(this);
- connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));
+ connect(ui.ownNick, selectOverload<const QString&>(&QComboBox::activated), this, &InputWidget::changeNick);
layout()->setAlignment(ui.ownNick, Qt::AlignBottom);
layout()->setAlignment(ui.inputEdit, Qt::AlignBottom);
ui.textcolorButton->setMenu(_colorMenu);
// Set the default action to clear color (last added action)
ui.textcolorButton->setDefaultAction(_colorMenu->actions().last());
- connect(_colorMenu, SIGNAL(triggered(QAction *)), this, SLOT(colorChosen(QAction *)));
+ connect(_colorMenu, &QMenu::triggered, this, &InputWidget::colorChosen);
ui.highlightcolorButton->setMenu(_colorFillMenu);
// Set the default action to clear fill color (last added action)
ui.highlightcolorButton->setDefaultAction(_colorFillMenu->actions().last());
- connect(_colorFillMenu, SIGNAL(triggered(QAction *)), this, SLOT(colorHighlightChosen(QAction *)));
+ connect(_colorFillMenu, &QMenu::triggered, this, &InputWidget::colorHighlightChosen);
// Needs to be done after adding the menu, otherwise the icon mysteriously vanishes until clicked
ui.textcolorButton->setIcon(icon::get("format-text-color"));
ui.highlightcolorButton->setIcon(icon::get("format-fill-color"));
// Show/hide style button
- connect(ui.showStyleButton, SIGNAL(toggled(bool)), this, SLOT(setStyleOptionsExpanded(bool)));
+ connect(ui.showStyleButton, &QAbstractButton::toggled, this, &InputWidget::setStyleOptionsExpanded);
// Clear formatting button
- connect(ui.clearButton, SIGNAL(clicked()), this, SLOT(clearFormat()));
+ connect(ui.clearButton, &QAbstractButton::clicked, this, &InputWidget::clearFormat);
new TabCompleter(ui.inputEdit);
setMultiLineEnabled(s.value("EnableMultiLine", true));
ActionCollection *coll = QtUi::actionCollection();
+ coll->addAction("FocusInputLine", new Action{tr("Focus Input Line"), coll, this, selectOverload<>(&QWidget::setFocus), QKeySequence(Qt::CTRL + Qt::Key_L)});
- Action *activateInputline = coll->add<Action>("FocusInputLine");
- connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus()));
- activateInputline->setText(tr("Focus Input Line"));
- activateInputline->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
-
- connect(inputLine(), SIGNAL(textEntered(QString)), SLOT(onTextEntered(QString)), Qt::QueuedConnection); // make sure the line is already reset, bug #984
- connect(inputLine(), SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat)));
+ connect(inputLine(), &MultiLineEdit::textEntered, this, &InputWidget::onTextEntered, Qt::QueuedConnection); // make sure the line is already reset, bug #984
+ connect(inputLine(), &QTextEdit::currentCharFormatChanged, this, &InputWidget::currentCharFormatChanged);
}
if (event->type() != QEvent::KeyPress)
return false;
- QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+ auto *keyEvent = static_cast<QKeyEvent *>(event);
// keys from BufferView should be sent to (and focus) the input line
- BufferView *view = qobject_cast<BufferView *>(watched);
+ auto *view = qobject_cast<BufferView *>(watched);
if (view) {
if (keyEvent->text().length() == 1 && !(keyEvent->modifiers() & (Qt::ControlModifier ^ Qt::AltModifier))) { // normal key press
QChar c = keyEvent->text().at(0);
bool encrypted = false;
- IrcChannel *chan = qobject_cast<IrcChannel *>(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcChannelRole).value<QObject *>());
+ auto *chan = qobject_cast<IrcChannel *>(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcChannelRole).value<QObject *>());
if (chan)
encrypted = chan->encrypted();
- IrcUser *user = qobject_cast<IrcUser *>(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcUserRole).value<QObject *>());
+ auto *user = qobject_cast<IrcUser *>(Client::bufferModel()->data(selectionModel()->currentIndex(), NetworkModel::IrcUserRole).value<QObject *>());
if (user)
encrypted = user->encrypted();
const Network *network = Client::network(networkId);
if (network) {
- connect(network, SIGNAL(identitySet(IdentityId)), this, SLOT(setIdentity(IdentityId)));
+ connect(network, &Network::identitySet, this, &InputWidget::setIdentity);
connectMyIrcUser();
setIdentity(network->identity());
}
{
const Network *network = currentNetwork();
if (network->me()) {
- connect(network->me(), SIGNAL(nickSet(const QString &)), this, SLOT(updateNickSelector()));
- connect(network->me(), SIGNAL(userModesSet(QString)), this, SLOT(updateNickSelector()));
- connect(network->me(), SIGNAL(userModesAdded(QString)), this, SLOT(updateNickSelector()));
- connect(network->me(), SIGNAL(userModesRemoved(QString)), this, SLOT(updateNickSelector()));
- connect(network->me(), SIGNAL(awaySet(bool)), this, SLOT(updateNickSelector()));
- disconnect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+ connect(network->me(), &IrcUser::nickSet, this, &InputWidget::updateNickSelector);
+ connect(network->me(), &IrcUser::userModesSet, this, &InputWidget::updateNickSelector);
+ connect(network->me(), &IrcUser::userModesAdded, this, &InputWidget::updateNickSelector);
+ connect(network->me(), &IrcUser::userModesRemoved, this, &InputWidget::updateNickSelector);
+ connect(network->me(), &IrcUser::awaySet, this, &InputWidget::updateNickSelector);
+ disconnect(network, &Network::myNickSet, this, &InputWidget::connectMyIrcUser);
updateNickSelector();
}
else {
- connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+ connect(network, &Network::myNickSet, this, &InputWidget::connectMyIrcUser);
}
}
const Identity *identity = Client::identity(identityId);
if (identity) {
- connect(identity, SIGNAL(nicksSet(QStringList)), this, SLOT(updateNickSelector()));
+ connect(identity, &Identity::nicksSet, this, &InputWidget::updateNickSelector);
}
else {
_identityId = 0;