projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Prefer default member init over ctor init
[quassel.git]
/
src
/
uisupport
/
networkmodelcontroller.cpp
diff --git
a/src/uisupport/networkmodelcontroller.cpp
b/src/uisupport/networkmodelcontroller.cpp
index
bb6482c
..
d7dc64e
100644
(file)
--- a/
src/uisupport/networkmodelcontroller.cpp
+++ b/
src/uisupport/networkmodelcontroller.cpp
@@
-41,9
+41,7
@@
NetworkModelController::NetworkModelController(QObject *parent)
: QObject(parent),
NetworkModelController::NetworkModelController(QObject *parent)
: QObject(parent),
- _actionCollection(new ActionCollection(this)),
- _messageFilter(0),
- _receiver(0)
+ _actionCollection(new ActionCollection(this))
{
connect(_actionCollection, SIGNAL(actionTriggered(QAction *)), SLOT(actionTriggered(QAction *)));
}
{
connect(_actionCollection, SIGNAL(actionTriggered(QAction *)), SLOT(actionTriggered(QAction *)));
}
@@
-175,7
+173,7
@@
void NetworkModelController::removeBuffers(const QModelIndexList &indexList)
}
QString msg;
if (inactive.count()) {
}
QString msg;
if (inactive.count()) {
- msg = tr("Do you want to delete the following buffer(s) permanently?",
0
, inactive.count());
+ msg = tr("Do you want to delete the following buffer(s) permanently?",
""
, inactive.count());
msg += "<ul>";
int count = 0;
foreach(BufferInfo info, inactive) {
msg += "<ul>";
int count = 0;
foreach(BufferInfo info, inactive) {
@@
-193,7
+191,7
@@
void NetworkModelController::removeBuffers(const QModelIndexList &indexList)
if (inactive.count() != indexList.count())
msg += tr("<br>Active channel buffers cannot be deleted, please part the channel first.");
if (inactive.count() != indexList.count())
msg += tr("<br>Active channel buffers cannot be deleted, please part the channel first.");
- if (QMessageBox::question(
0
, tr("Remove buffers permanently?"), msg, QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) {
+ if (QMessageBox::question(
nullptr
, tr("Remove buffers permanently?"), msg, QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) {
foreach(BufferInfo info, inactive)
Client::removeBuffer(info.bufferId());
}
foreach(BufferInfo info, inactive)
Client::removeBuffer(info.bufferId());
}
@@
-238,9
+236,9
@@
void NetworkModelController::actionTriggered(QAction *action)
void NetworkModelController::handleNetworkAction(ActionType type, QAction *)
{
if (type == NetworkConnectAllWithDropdown || type == NetworkDisconnectAllWithDropdown || type == NetworkConnectAll || type == NetworkDisconnectAll) {
void NetworkModelController::handleNetworkAction(ActionType type, QAction *)
{
if (type == NetworkConnectAllWithDropdown || type == NetworkDisconnectAllWithDropdown || type == NetworkConnectAll || type == NetworkDisconnectAll) {
- if (type == NetworkConnectAllWithDropdown && QMessageBox::question(
0
, tr("Question"), tr("Really Connect to all IRC Networks?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No)
+ if (type == NetworkConnectAllWithDropdown && QMessageBox::question(
nullptr
, tr("Question"), tr("Really Connect to all IRC Networks?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No)
return;
return;
- if (type == NetworkDisconnectAllWithDropdown && QMessageBox::question(
0
, tr("Question"), tr("Really disconnect from all IRC Networks?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No)
+ if (type == NetworkDisconnectAllWithDropdown && QMessageBox::question(
nullptr
, tr("Question"), tr("Really disconnect from all IRC Networks?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No)
return;
foreach(NetworkId id, Client::networkIds()) {
const Network *net = Client::network(id);
return;
foreach(NetworkId id, Client::networkIds()) {
const Network *net = Client::network(id);
@@
-363,7
+361,7
@@
void NetworkModelController::handleHideAction(ActionType type, QAction *action)
return;
case HideApplyToAll:
BufferSettings().setMessageFilter(filter);
return;
case HideApplyToAll:
BufferSettings().setMessageFilter(filter);
- [[clang::fallthrough]];
+ // fallthrough
case HideUseDefaults:
if (_messageFilter)
BufferSettings(_messageFilter->idString()).removeFilter();
case HideUseDefaults:
if (_messageFilter)
BufferSettings(_messageFilter->idString()).removeFilter();
@@
-412,8
+410,10
@@
void NetworkModelController::handleGeneralAction(ActionType type, QAction *actio
break;
}
case ShowChannelList:
break;
}
case ShowChannelList:
- if (networkId.isValid())
- emit showChannelList(networkId, {});
+ if (networkId.isValid()) {
+ // Don't immediately list channels, allowing customization of filter first
+ emit showChannelList(networkId, {}, false);
+ }
break;
case ShowNetworkConfig:
if (networkId.isValid())
break;
case ShowNetworkConfig:
if (networkId.isValid())