X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fchannellistdlg.cpp;h=f5654c5b346761d50d6a9fc37b2cdff0ad46d664;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hp=204590edb128ab2f2d1dd9625cc43904b9e5e503;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git

diff --git a/src/qtui/channellistdlg.cpp b/src/qtui/channellistdlg.cpp
index 204590ed..f5654c5b 100644
--- a/src/qtui/channellistdlg.cpp
+++ b/src/qtui/channellistdlg.cpp
@@ -30,11 +30,8 @@
 
 ChannelListDlg::ChannelListDlg(QWidget *parent)
     : QDialog(parent),
-    _listFinished(true),
     _ircListModel(this),
-    _sortFilter(this),
-    _simpleModeSpacer(nullptr),
-    _advancedMode(false)
+    _sortFilter(this)
 {
     _sortFilter.setSourceModel(&_ircListModel);
     _sortFilter.setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -58,15 +55,15 @@ ChannelListDlg::ChannelListDlg(QWidget *parent)
 
     setWindowIcon(icon::get("format-list-unordered"));
 
-    connect(ui.advancedModeLabel, SIGNAL(clicked()), this, SLOT(toggleMode()));
-    connect(ui.searchChannelsButton, SIGNAL(clicked()), this, SLOT(requestSearch()));
-    connect(ui.channelNameLineEdit, SIGNAL(returnPressed()), this, SLOT(requestSearch()));
-    connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), &_sortFilter, SLOT(setFilterFixedString(QString)));
-    connect(Client::ircListHelper(), SIGNAL(channelListReceived(const NetworkId &, const QStringList &, QList<IrcListHelper::ChannelDescription> )),
-        this, SLOT(receiveChannelList(NetworkId, QStringList, QList<IrcListHelper::ChannelDescription> )));
-    connect(Client::ircListHelper(), SIGNAL(finishedListReported(const NetworkId &)), this, SLOT(reportFinishedList()));
-    connect(Client::ircListHelper(), SIGNAL(errorReported(const QString &)), this, SLOT(showError(const QString &)));
-    connect(ui.channelListView, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
+    connect(ui.advancedModeLabel, &ClickableLabel::clicked, this, &ChannelListDlg::toggleMode);
+    connect(ui.searchChannelsButton, &QAbstractButton::clicked, this, &ChannelListDlg::requestSearch);
+    connect(ui.channelNameLineEdit, &QLineEdit::returnPressed, this, &ChannelListDlg::requestSearch);
+    connect(ui.filterLineEdit, &QLineEdit::textChanged, &_sortFilter, &QSortFilterProxyModel::setFilterFixedString);
+    connect(Client::ircListHelper(), &ClientIrcListHelper::channelListReceived,
+        this, &ChannelListDlg::receiveChannelList);
+    connect(Client::ircListHelper(), &ClientIrcListHelper::finishedListReported, this, &ChannelListDlg::reportFinishedList);
+    connect(Client::ircListHelper(), &ClientIrcListHelper::errorReported, this, &ChannelListDlg::showError);
+    connect(ui.channelListView, &QAbstractItemView::activated, this, &ChannelListDlg::joinChannel);
 
     setAdvancedMode(false);
     enableQuery(true);