X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcontextmenuactionprovider.cpp;h=79c9d19b0bd2df1f71e9d8389825d7cf4fd15c5e;hp=3bd7b3d9d7cefa9d7d896db519b82567f947930c;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=b7447afe8e836376776dac26704e227a678d2913 diff --git a/src/uisupport/contextmenuactionprovider.cpp b/src/uisupport/contextmenuactionprovider.cpp index 3bd7b3d9..79c9d19b 100644 --- a/src/uisupport/contextmenuactionprovider.cpp +++ b/src/uisupport/contextmenuactionprovider.cpp @@ -92,7 +92,7 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM registerAction(ShowNetworkConfig, tr("Configure")); registerAction(ShowIgnoreList, tr("Show Ignore List")); - QMenu *hideEventsMenu = new QMenu(); + auto *hideEventsMenu = new QMenu(); hideEventsMenu->addAction(action(HideJoinPartQuit)); hideEventsMenu->addSeparator(); hideEventsMenu->addAction(action(HideJoin)); @@ -105,18 +105,18 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM hideEventsMenu->addSeparator(); hideEventsMenu->addAction(action(HideApplyToAll)); hideEventsMenu->addAction(action(HideUseDefaults)); - _hideEventsMenuAction = new Action(tr("Hide Events"), 0); + _hideEventsMenuAction = new Action(tr("Hide Events"), nullptr); _hideEventsMenuAction->setMenu(hideEventsMenu); - QMenu *nickCtcpMenu = new QMenu(); + auto *nickCtcpMenu = new QMenu(); nickCtcpMenu->addAction(action(NickCtcpPing)); nickCtcpMenu->addAction(action(NickCtcpVersion)); nickCtcpMenu->addAction(action(NickCtcpTime)); nickCtcpMenu->addAction(action(NickCtcpClientinfo)); - _nickCtcpMenuAction = new Action(tr("CTCP"), 0); + _nickCtcpMenuAction = new Action(tr("CTCP"), nullptr); _nickCtcpMenuAction->setMenu(nickCtcpMenu); - QMenu *nickModeMenu = new QMenu(); + auto *nickModeMenu = new QMenu(); nickModeMenu->addAction(action(NickOp)); nickModeMenu->addAction(action(NickDeop)); // this is where the halfops will be placed if available @@ -128,11 +128,11 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM nickModeMenu->addAction(action(NickKick)); nickModeMenu->addAction(action(NickBan)); nickModeMenu->addAction(action(NickKickBan)); - _nickModeMenuAction = new Action(tr("Actions"), 0); + _nickModeMenuAction = new Action(tr("Actions"), nullptr); _nickModeMenuAction->setMenu(nickModeMenu); - QMenu *ignoreMenu = new QMenu(); - _nickIgnoreMenuAction = new Action(tr("Ignore"), 0); + auto *ignoreMenu = new QMenu(); + _nickIgnoreMenuAction = new Action(tr("Ignore"), nullptr); _nickIgnoreMenuAction->setMenu(ignoreMenu); // These are disabled actions used as descriptions @@ -171,7 +171,7 @@ void ContextMenuActionProvider::addActions(QMenu *menu, const QModelIndex &index { if (!index.isValid()) return; - addActions(menu, QList() << index, 0, QString(), receiver, method, isCustomBufferView); + addActions(menu, QList() << index, nullptr, QString(), receiver, method, isCustomBufferView); } @@ -191,7 +191,7 @@ void ContextMenuActionProvider::addActions(QMenu *menu, MessageFilter *filter, B void ContextMenuActionProvider::addActions(QMenu *menu, const QList &indexList, QObject *receiver, const char *method, bool isCustomBufferView) { - addActions(menu, indexList, 0, QString(), receiver, method, isCustomBufferView); + addActions(menu, indexList, nullptr, QString(), receiver, method, isCustomBufferView); } @@ -348,7 +348,7 @@ void ContextMenuActionProvider::addIrcUserActions(QMenu *menu, const QModelIndex addAction(_nickModeMenuAction, menu, itemType == NetworkModel::IrcUserItemType); addAction(_nickCtcpMenuAction, menu); - IrcUser *ircUser = qobject_cast(index.data(NetworkModel::IrcUserRole).value()); + auto *ircUser = qobject_cast(index.data(NetworkModel::IrcUserRole).value()); if (ircUser) { Network *network = ircUser->network(); // only show entries for usermode +h if server supports it @@ -508,7 +508,7 @@ void ContextMenuActionProvider::addIgnoreMenu(QMenu *menu, const QString &hostma ignoreMenu->addAction(_ignoreDescriptions.at(1)); while (ruleIter != ignoreMap.constEnd()) { if (counter < 5) { - ActionType type = static_cast(NickIgnoreToggleEnabled0 + counter*0x100000); + auto type = static_cast(NickIgnoreToggleEnabled0 + counter*0x100000); Action *act = action(type); act->setText(ruleIter.key()); act->setProperty("ignoreRule", ruleIter.key());