X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=f8c4cace42f600f8036c5ca4eec5c7e023a2749f;hp=370ecdc4cb3344e23c4c8da428a2f312fa8af1e6;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=f3d6f8088d8be6af9319a99fb8d2fee2837b540a

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 370ecdc4..f8c4cace 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,7 +18,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QIcon>
 #include <QLayout>
 #include <QKeyEvent>
 #include <QMenu>
@@ -33,6 +32,7 @@
 #include "chatviewsearchcontroller.h"
 #include "chatviewsettings.h"
 #include "client.h"
+#include "icon.h"
 #include "multilineedit.h"
 #include "qtui.h"
 #include "settings.h"
@@ -53,48 +53,48 @@ 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, &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, SIGNAL(hidden()), this, SLOT(setFocus()));
 
-    connect(_chatViewSearchController, SIGNAL(newCurrentHighlight(QGraphicsItem *)),
-        this, SLOT(scrollToHighlight(QGraphicsItem *)));
+    connect(_chatViewSearchController, &ChatViewSearchController::newCurrentHighlight,
+        this, &BufferWidget::scrollToHighlight);
 
     ActionCollection *coll = QtUi::actionCollection();
 
-    Action *zoomInChatview = coll->add<Action>("ZoomInChatView", this, SLOT(zoomIn()));
+    auto *zoomInChatview = coll->add<Action>("ZoomInChatView", this, SLOT(zoomIn()));
     zoomInChatview->setText(tr("Zoom In"));
-    zoomInChatview->setIcon(QIcon::fromTheme("zoom-in"));
+    zoomInChatview->setIcon(icon::get("zoom-in"));
     zoomInChatview->setShortcut(QKeySequence::ZoomIn);
 
-    Action *zoomOutChatview = coll->add<Action>("ZoomOutChatView", this, SLOT(zoomOut()));
-    zoomOutChatview->setIcon(QIcon::fromTheme("zoom-out"));
+    auto *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(QIcon::fromTheme("zoom-original"));
+    auto *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()));
+    auto *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()));
+    auto *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));
 
@@ -107,7 +107,7 @@ BufferWidget::BufferWidget(QWidget *parent)
 BufferWidget::~BufferWidget()
 {
     delete _chatViewSearchController;
-    _chatViewSearchController = 0;
+    _chatViewSearchController = nullptr;
 }
 
 
@@ -150,7 +150,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 +160,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 +169,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 +177,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 +185,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 +207,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 +217,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;
@@ -232,6 +232,7 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event)
     case Qt::Key_Down:
         if (!(keyEvent->modifiers() & Qt::ShiftModifier))
             return false;
+        // fallthrough
     case Qt::Key_PageUp:
     case Qt::Key_PageDown:
         // static cast to access public qobject::event
@@ -244,12 +245,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()) {