modernize: Migrate action-related things to PMF connects

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

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 2d8e3a0..41e98a5 100644 (file)
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -53,50 +53,35 @@ BufferWidget::BufferWidget(QWidget *parent)
     _chatViewSearchController->setSearchMsgs(ui.searchBar->searchMsgsBox()->isChecked());
     _chatViewSearchController->setSearchOnlyRegularMsgs(ui.searchBar->searchOnlyRegularMsgsBox()->isChecked());
 
-    connect(ui.searchBar, SIGNAL(searchChanged(const QString &)),
-        _chatViewSearchController, SLOT(setSearchString(const QString &)));
-    connect(ui.searchBar->caseSensitiveBox(), SIGNAL(toggled(bool)),
-        _chatViewSearchController, SLOT(setCaseSensitive(bool)));
-    connect(ui.searchBar->searchSendersBox(), SIGNAL(toggled(bool)),
-        _chatViewSearchController, SLOT(setSearchSenders(bool)));
-    connect(ui.searchBar->searchMsgsBox(), SIGNAL(toggled(bool)),
-        _chatViewSearchController, SLOT(setSearchMsgs(bool)));
-    connect(ui.searchBar->searchOnlyRegularMsgsBox(), SIGNAL(toggled(bool)),
-        _chatViewSearchController, SLOT(setSearchOnlyRegularMsgs(bool)));
-    connect(ui.searchBar->searchUpButton(), SIGNAL(clicked()),
-        _chatViewSearchController, SLOT(highlightPrev()));
-    connect(ui.searchBar->searchDownButton(), SIGNAL(clicked()),
-        _chatViewSearchController, SLOT(highlightNext()));
-
-    connect(ui.searchBar, SIGNAL(hidden()), this, SLOT(setFocus()));
-
-    connect(_chatViewSearchController, SIGNAL(newCurrentHighlight(QGraphicsItem *)),
-        this, SLOT(scrollToHighlight(QGraphicsItem *)));
+    connect(ui.searchBar, &ChatViewSearchBar::searchChanged,
+        _chatViewSearchController, &ChatViewSearchController::setSearchString);
+    connect(ui.searchBar->caseSensitiveBox(), &QAbstractButton::toggled,
+        _chatViewSearchController, &ChatViewSearchController::setCaseSensitive);
+    connect(ui.searchBar->searchSendersBox(), &QAbstractButton::toggled,
+        _chatViewSearchController, &ChatViewSearchController::setSearchSenders);
+    connect(ui.searchBar->searchMsgsBox(), &QAbstractButton::toggled,
+        _chatViewSearchController, &ChatViewSearchController::setSearchMsgs);
+    connect(ui.searchBar->searchOnlyRegularMsgsBox(), &QAbstractButton::toggled,
+        _chatViewSearchController, &ChatViewSearchController::setSearchOnlyRegularMsgs);
+    connect(ui.searchBar->searchUpButton(), &QAbstractButton::clicked,
+        _chatViewSearchController, &ChatViewSearchController::highlightPrev);
+    connect(ui.searchBar->searchDownButton(), &QAbstractButton::clicked,
+        _chatViewSearchController, &ChatViewSearchController::highlightNext);
+
+    connect(ui.searchBar, &ChatViewSearchBar::hidden, this, selectOverload<>(&QWidget::setFocus));
+
+    connect(_chatViewSearchController, &ChatViewSearchController::newCurrentHighlight,
+        this, &BufferWidget::scrollToHighlight);
 
     ActionCollection *coll = QtUi::actionCollection();
-
-    Action *zoomInChatview = coll->add<Action>("ZoomInChatView", this, SLOT(zoomIn()));
-    zoomInChatview->setText(tr("Zoom In"));
-    zoomInChatview->setIcon(icon::get("zoom-in"));
-    zoomInChatview->setShortcut(QKeySequence::ZoomIn);
-
-    Action *zoomOutChatview = coll->add<Action>("ZoomOutChatView", this, SLOT(zoomOut()));
-    zoomOutChatview->setIcon(icon::get("zoom-out"));
-    zoomOutChatview->setText(tr("Zoom Out"));
-    zoomOutChatview->setShortcut(QKeySequence::ZoomOut);
-
-    Action *zoomOriginalChatview = coll->add<Action>("ZoomOriginalChatView", this, SLOT(zoomOriginal()));
-    zoomOriginalChatview->setIcon(icon::get("zoom-original"));
-    zoomOriginalChatview->setText(tr("Actual Size"));
-    //zoomOriginalChatview->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0)); // used for RTS switching
-
-    Action *setMarkerLine = coll->add<Action>("SetMarkerLineToBottom", this, SLOT(setMarkerLine()));
-    setMarkerLine->setText(tr("Set Marker Line"));
-    setMarkerLine->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
-
-    Action *jumpToMarkerLine = QtUi::actionCollection("Navigation")->add<Action>("JumpToMarkerLine", this, SLOT(jumpToMarkerLine()));
-    jumpToMarkerLine->setText(tr("Go to Marker Line"));
-    jumpToMarkerLine->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_K));
+    coll->addActions({
+        {"ZoomInChatView", new Action{icon::get("zoom-in"), tr("Zoom In"), coll, this, &BufferWidget::zoomIn, QKeySequence::ZoomIn}},
+        {"ZoomOutChatView", new Action{icon::get("zoom-out"), tr("Zoom Out"), coll, this, &BufferWidget::zoomOut, QKeySequence::ZoomOut}},
+        {"ZoomOriginalChatView", new Action{icon::get("zoom-original"), tr("Actual Size"), coll, this, &BufferWidget::zoomOriginal}},
+        {"SetMarkerLineToBottom", new Action{tr("Set Marker Line"), coll, this, [this]() { setMarkerLine(); }, QKeySequence(Qt::CTRL + Qt::Key_R)}}
+    });
+    coll = QtUi::actionCollection("Navigation");
+    coll->addAction("JumpToMarkerLine", new Action{tr("Go to Marker Line"), coll, this, [this]() { jumpToMarkerLine(); }, QKeySequence(Qt::CTRL + Qt::Key_K)});
 
     ChatViewSettings s;
     s.initAndNotify("AutoMarkerLine", this, SLOT(setAutoMarkerLine(QVariant)), true);
@@ -107,7 +92,7 @@ BufferWidget::BufferWidget(QWidget *parent)
 BufferWidget::~BufferWidget()
 {
     delete _chatViewSearchController;
-    _chatViewSearchController = 0;
+    _chatViewSearchController = nullptr;
 }
 
 
@@ -150,7 +135,7 @@ void BufferWidget::showChatView(BufferId id)
         ui.stackedWidget->setCurrentWidget(ui.page);
     }
     else {
-        ChatView *view = qobject_cast<ChatView *>(_chatViews.value(id));
+        auto *view = qobject_cast<ChatView *>(_chatViews.value(id));
         Q_ASSERT(view);
         ui.stackedWidget->setCurrentWidget(view);
         _chatViewSearchController->setScene(view->scene());
@@ -160,7 +145,7 @@ void BufferWidget::showChatView(BufferId id)
 
 void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem)
 {
-    ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+    auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
     if (view) {
         view->centerOn(highlightItem);
     }
@@ -169,7 +154,7 @@ void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem)
 
 void BufferWidget::zoomIn()
 {
-    ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+    auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
     if (view)
         view->zoomIn();
 }
@@ -177,7 +162,7 @@ void BufferWidget::zoomIn()
 
 void BufferWidget::zoomOut()
 {
-    ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+    auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
     if (view)
         view->zoomOut();
 }
@@ -185,7 +170,7 @@ void BufferWidget::zoomOut()
 
 void BufferWidget::zoomOriginal()
 {
-    ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+    auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
     if (view)
         view->zoomOriginal();
 }
@@ -207,9 +192,9 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event)
     if (event->type() != QEvent::KeyPress)
         return false;
 
-    QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+    auto *keyEvent = static_cast<QKeyEvent *>(event);
 
-    MultiLineEdit *inputLine = qobject_cast<MultiLineEdit *>(watched);
+    auto *inputLine = qobject_cast<MultiLineEdit *>(watched);
     if (!inputLine)
         return false;
 
@@ -217,7 +202,7 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event)
     if (keyEvent == QKeySequence::Copy) {
         if (inputLine->hasSelectedText())
             return false;
-        ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+        auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
         if (view)
             view->scene()->selectionToClipboard();
         return true;
@@ -245,12 +230,12 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event)
 
 void BufferWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous)
 {
-    ChatView *prevView = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+    auto *prevView = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
 
     AbstractBufferContainer::currentChanged(current, previous); // switch first to avoid a redraw
 
     // we need to hide the marker line if it's already/still at the bottom of the view (and not scrolled up)
-    ChatView *curView = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+    auto *curView = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
     if (curView) {
         BufferId curBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
         if (curBufferId.isValid()) {