clazy: Convert many old-style connects into function pointer based

[quassel.git] / src / qtui / channellistdlg.cpp

diff --git a/src/qtui/channellistdlg.cpp b/src/qtui/channellistdlg.cpp
index 76b81bb..f5654c5 100644 (file)
--- 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(0),
-    _advancedMode(false)
+    _sortFilter(this)
 {
     _sortFilter.setSourceModel(&_ircListModel);
     _sortFilter.setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -49,6 +46,8 @@ ChannelListDlg::ChannelListDlg(QWidget *parent)
     ui.channelListView->setTabKeyNavigation(false);
     ui.channelListView->setModel(&_sortFilter);
     ui.channelListView->setSortingEnabled(true);
+    // Sort A-Z by default
+    ui.channelListView->sortByColumn(0, Qt::AscendingOrder);
     ui.channelListView->verticalHeader()->hide();
     ui.channelListView->horizontalHeader()->setStretchLastSection(true);
 
@@ -56,20 +55,23 @@ 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);
     showFilterLine(false);
     showErrors(false);
+
+    // Set initial input focus
+    updateInputFocus();
 }
 
 
@@ -84,8 +86,22 @@ void ChannelListDlg::setNetwork(NetworkId netId)
 }
 
 
+void ChannelListDlg::setChannelFilters(const QString &channelFilters)
+{
+    // Enable advanced mode if searching
+    setAdvancedMode(!channelFilters.isEmpty());
+    // Set channel search text after setting advanced mode so it's not cleared
+    ui.channelNameLineEdit->setText(channelFilters.trimmed());
+}
+
+
 void ChannelListDlg::requestSearch()
 {
+    if (!_netId.isValid()) {
+        // No valid network set yet
+        return;
+    }
+
     _listFinished = false;
     enableQuery(false);
     showErrors(false);
@@ -104,6 +120,8 @@ void ChannelListDlg::receiveChannelList(const NetworkId &netId, const QStringLis
     showFilterLine(!channelList.isEmpty());
     _ircListModel.setChannelList(channelList);
     enableQuery(_listFinished);
+    // Reset input focus since UI changed
+    updateInputFocus();
 }
 
 
@@ -130,7 +148,7 @@ void ChannelListDlg::setAdvancedMode(bool advanced)
         if (_simpleModeSpacer) {
             ui.searchLayout->removeItem(_simpleModeSpacer);
             delete _simpleModeSpacer;
-            _simpleModeSpacer = 0;
+            _simpleModeSpacer = nullptr;
         }
         ui.advancedModeLabel->setPixmap(icon::get("edit-clear-locationbar-rtl").pixmap(16));
     }
@@ -148,6 +166,18 @@ void ChannelListDlg::setAdvancedMode(bool advanced)
 }
 
 
+void ChannelListDlg::updateInputFocus()
+{
+    // Update keyboard focus to match what options are available.  Prioritize the channel name
+    // editor as one likely won't need to filter when already limiting the list.
+    if (ui.channelNameLineEdit->isVisible()) {
+        ui.channelNameLineEdit->setFocus();
+    } else if (ui.filterLineEdit->isVisible()) {
+        ui.filterLineEdit->setFocus();
+    }
+}
+
+
 void ChannelListDlg::showErrors(bool show)
 {
     if (!show) {