: QObject(parent),
_actionCollection(new ActionCollection(this))
{
- connect(_actionCollection, SIGNAL(actionTriggered(QAction *)), SLOT(actionTriggered(QAction *)));
+ connect(_actionCollection, &ActionCollection::actionTriggered, this, &NetworkModelController::actionTriggered);
}
}
-void NetworkModelController::setSlot(QObject *receiver, const char *method)
+void NetworkModelController::setSlot(ActionSlot slot)
{
- _receiver = receiver;
- _method = method;
+ _actionSlot = std::move(slot);
}
QString NetworkModelController::nickName(const QModelIndex &index) const
{
- IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+ auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
if (ircUser)
return ircUser->nick();
{
NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
if (!networkId.isValid())
- return BufferId();
+ return {};
QString nick = predefinedNick.isEmpty() ? nickName(index) : predefinedNick;
if (nick.isEmpty())
- return BufferId();
+ return {};
return findQueryBuffer(networkId, nick);
}
void NetworkModelController::handleExternalAction(ActionType type, QAction *action)
{
Q_UNUSED(type);
- if (receiver() && method()) {
- if (!QMetaObject::invokeMethod(receiver(), method(), Q_ARG(QAction *, action)))
- qWarning() << "NetworkModelActionController::handleExternalAction(): Could not invoke slot" << receiver() << method();
+ if (_actionSlot) {
+ _actionSlot(action);
}
}
break;
case NickIgnoreUser:
{
- IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+ auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
if (!ircUser)
break;
Client::ignoreListManager()->requestAddIgnoreListItem(IgnoreListManager::SenderIgnore,
}
case NickIgnoreHost:
{
- IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+ auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
if (!ircUser)
break;
Client::ignoreListManager()->requestAddIgnoreListItem(IgnoreListManager::SenderIgnore,
}
case NickIgnoreDomain:
{
- IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+ auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
if (!ircUser)
break;
Client::ignoreListManager()->requestAddIgnoreListItem(IgnoreListManager::SenderIgnore,
setWindowIcon(icon::get("irc-join-channel"));
setWindowTitle(tr("Join Channel"));
- QGridLayout *layout = new QGridLayout(this);
+ auto *layout = new QGridLayout(this);
layout->addWidget(new QLabel(tr("Network:")), 0, 0);
layout->addWidget(networks = new QComboBox, 0, 1);
layout->addWidget(new QLabel(tr("Channel:")), 1, 0);
networks->setInsertPolicy(QComboBox::InsertAlphabetically);
password->setEchoMode(QLineEdit::Password);
- connect(buttonBox, SIGNAL(accepted()), SLOT(accept()));
- connect(buttonBox, SIGNAL(rejected()), SLOT(reject()));
- connect(channel, SIGNAL(textChanged(QString)), SLOT(on_channel_textChanged(QString)));
+ connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+ connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+ connect(channel, &QLineEdit::textChanged, this, &JoinDlg::on_channel_textChanged);
foreach(NetworkId id, Client::networkIds()) {
const Network *net = Client::network(id);