X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=3a2be71a7cb0f759ede2d74bcd5b2dc9e0e3c54c;hp=f1316953b9b234bd24e496131ab0c356b02880d2;hb=a700bd999215313b075ced5a1e3ba4ea8917fbbc;hpb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index f1316953..3a2be71a 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,8 +20,8 @@ #include "bufferview.h" -#include #include +#include #include #include #include @@ -32,36 +32,34 @@ #include "action.h" #include "buffermodel.h" -#include "bufferviewfilter.h" #include "buffersettings.h" #include "buffersyncer.h" +#include "bufferviewfilter.h" #include "client.h" #include "contextmenuactionprovider.h" #include "graphicalui.h" #include "network.h" #include "networkmodel.h" -#include "contextmenuactionprovider.h" /***************************************** -* The TreeView showing the Buffers -*****************************************/ + * The TreeView showing the Buffers + *****************************************/ // Please be carefull when reimplementing methods which are used to inform the view about changes to the data // to be on the safe side: call QTreeView's method aswell (or TreeViewTouch's) -BufferView::BufferView(QWidget *parent) +BufferView::BufferView(QWidget* parent) : TreeViewTouch(parent) { - connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &))); - connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &))); + connect(this, &QTreeView::collapsed, this, &BufferView::storeExpandedState); + connect(this, &QTreeView::expanded, this, &BufferView::storeExpandedState); setSelectionMode(QAbstractItemView::ExtendedSelection); - QAbstractItemDelegate *oldDelegate = itemDelegate(); - auto *tristateDelegate = new BufferViewDelegate(this); + QAbstractItemDelegate* oldDelegate = itemDelegate(); + auto* tristateDelegate = new BufferViewDelegate(this); setItemDelegate(tristateDelegate); delete oldDelegate; } - void BufferView::init() { header()->setContextMenuPolicy(Qt::ActionsContextMenu); @@ -71,7 +69,7 @@ void BufferView::init() // New entries will be expanded automatically when added; no need to call expandAll() - header()->hide(); // nobody seems to use this anyway + header()->hide(); // nobody seems to use this anyway setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); @@ -91,24 +89,21 @@ void BufferView::init() #if defined Q_OS_MACOS || defined Q_OS_WIN // afaik this is better on Mac and Windows - disconnect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); - connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex))); + connect(this, &QAbstractItemView::activated, this, &BufferView::joinChannel, Qt::UniqueConnection); #else - disconnect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); - connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex))); + connect(this, &QAbstractItemView::doubleClicked, this, &BufferView::joinChannel, Qt::UniqueConnection); #endif } - -void BufferView::setModel(QAbstractItemModel *model) +void BufferView::setModel(QAbstractItemModel* model) { delete selectionModel(); TreeViewTouch::setModel(model); init(); // remove old Actions - QList oldactions = header()->actions(); - foreach(QAction *action, oldactions) { + QList oldactions = header()->actions(); + foreach (QAction* action, oldactions) { header()->removeAction(action); action->deleteLater(); } @@ -117,18 +112,18 @@ void BufferView::setModel(QAbstractItemModel *model) return; QString sectionName; - QAction *showSection; + QAction* showSection; for (int i = 1; i < model->columnCount(); i++) { sectionName = (model->headerData(i, Qt::Horizontal, Qt::DisplayRole)).toString(); showSection = new QAction(sectionName, header()); showSection->setCheckable(true); showSection->setChecked(!isColumnHidden(i)); showSection->setProperty("column", i); - connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool))); + connect(showSection, &QAction::toggled, this, &BufferView::toggleHeader); header()->addAction(showSection); } - connect(model, SIGNAL(layoutChanged()), this, SLOT(on_layoutChanged())); + connect(model, &QAbstractItemModel::layoutChanged, this, &BufferView::on_layoutChanged); // Make sure collapsation is correct after setting a model // This might not be needed here, only in BufferView::setFilteredModel(). If issues arise, just @@ -136,10 +131,9 @@ void BufferView::setModel(QAbstractItemModel *model) setExpandedState(); } - -void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) +void BufferView::setFilteredModel(QAbstractItemModel* model_, BufferViewConfig* config) { - auto *filter = qobject_cast(model()); + auto* filter = qobject_cast(model()); if (filter) { filter->setConfig(config); setConfig(config); @@ -155,15 +149,14 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * setModel(model_); } else { - auto *filter = new BufferViewFilter(model_, config); + auto* filter = new BufferViewFilter(model_, config); setModel(filter); - connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged())); + connect(filter, &BufferViewFilter::configChanged, this, &BufferView::on_configChanged); } setConfig(config); } - -void BufferView::setConfig(BufferViewConfig *config) +void BufferView::setConfig(BufferViewConfig* config) { if (_config == config) return; @@ -174,7 +167,7 @@ void BufferView::setConfig(BufferViewConfig *config) _config = config; if (config) { - connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &))); + connect(config, &BufferViewConfig::networkIdSet, this, &BufferView::setRootIndexForNetworkId); setRootIndexForNetworkId(config->networkId()); } else { @@ -183,8 +176,7 @@ void BufferView::setConfig(BufferViewConfig *config) } } - -void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) +void BufferView::setRootIndexForNetworkId(const NetworkId& networkId) { if (!networkId.isValid() || !model()) { setIndentation(10); @@ -202,8 +194,7 @@ void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) } } - -void BufferView::joinChannel(const QModelIndex &index) +void BufferView::joinChannel(const QModelIndex& index) { BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value(); @@ -215,8 +206,7 @@ void BufferView::joinChannel(const QModelIndex &index) Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); } - -void BufferView::dropEvent(QDropEvent *event) +void BufferView::dropEvent(QDropEvent* event) { QModelIndex index = indexAt(event->pos()); @@ -226,12 +216,11 @@ void BufferView::dropEvent(QDropEvent *event) // check if we're really _on_ the item and not indicating a move to just above or below the item // Magic margin number for this is from QAbstractItemViewPrivate::position() const int margin = 2; - if (cursorPos.y() - indexRect.top() < margin - || indexRect.bottom() - cursorPos.y() < margin) + if (cursorPos.y() - indexRect.top() < margin || indexRect.bottom() - cursorPos.y() < margin) return TreeViewTouch::dropEvent(event); // If more than one buffer was being dragged, treat this as a rearrangement instead of a merge request - QList > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData()); + QList> bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData()); if (bufferList.count() != 1) return TreeViewTouch::dropEvent(event); @@ -253,24 +242,29 @@ void BufferView::dropEvent(QDropEvent *event) if (index2.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer && index2.data(NetworkModel::ItemActiveRole) == true) return TreeViewTouch::dropEvent(event); - //If the source buffer is not mergeable(AKA not a Channel and not a Query), try rearranging instead - if (index2.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer && index2.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer) + // If the source buffer is not mergeable(AKA not a Channel and not a Query), try rearranging instead + if (index2.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer + && index2.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer) return TreeViewTouch::dropEvent(event); // If the target buffer is not mergeable(AKA not a Channel and not a Query), try rearranging instead - if (index.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer && index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer) + if (index.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer + && index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer) return TreeViewTouch::dropEvent(event); // Confirm that the user really wants to merge the buffers before doing so - int res = QMessageBox::question(nullptr, tr("Merge buffers permanently?"), - tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!").arg(Client::networkModel()->bufferName(bufferId2)).arg(Client::networkModel()->bufferName(bufferId1)), - QMessageBox::Yes|QMessageBox::No, QMessageBox::No); + int res = QMessageBox::question(nullptr, + tr("Merge buffers permanently?"), + tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!") + .arg(Client::networkModel()->bufferName(bufferId2)) + .arg(Client::networkModel()->bufferName(bufferId1)), + QMessageBox::Yes | QMessageBox::No, + QMessageBox::No); if (res == QMessageBox::Yes) { Client::mergeBuffersPermanently(bufferId1, bufferId2); } } - void BufferView::removeSelectedBuffers(bool permanently) { if (!config()) @@ -278,7 +272,7 @@ void BufferView::removeSelectedBuffers(bool permanently) BufferId bufferId; QSet removedRows; - foreach(QModelIndex index, selectionModel()->selectedIndexes()) { + foreach (QModelIndex index, selectionModel()->selectedIndexes()) { if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType) continue; @@ -289,7 +283,7 @@ void BufferView::removeSelectedBuffers(bool permanently) removedRows << bufferId; } - foreach(BufferId bufferId, removedRows) { + foreach (BufferId bufferId, removedRows) { if (permanently) config()->requestRemoveBufferPermanently(bufferId); else @@ -297,8 +291,7 @@ void BufferView::removeSelectedBuffers(bool permanently) } } - -void BufferView::rowsInserted(const QModelIndex &parent, int start, int end) +void BufferView::rowsInserted(const QModelIndex& parent, int start, int end) { TreeViewTouch::rowsInserted(parent, start, end); @@ -309,7 +302,6 @@ void BufferView::rowsInserted(const QModelIndex &parent, int start, int end) setExpandedState(parent); } - void BufferView::on_layoutChanged() { int numNets = model()->rowCount(QModelIndex()); @@ -319,7 +311,6 @@ void BufferView::on_layoutChanged() } } - void BufferView::on_configChanged() { Q_ASSERT(model()); @@ -333,7 +324,6 @@ void BufferView::on_configChanged() } } - void BufferView::setExpandedState() { // Expand all active networks, collapse inactive ones... unless manually changed @@ -341,7 +331,7 @@ void BufferView::setExpandedState() NetworkId networkId; for (int row = 0; row < model()->rowCount(); row++) { networkIdx = model()->index(row, 0); - if (model()->rowCount(networkIdx) == 0) + if (model()->rowCount(networkIdx) == 0) continue; networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value(); @@ -352,8 +342,7 @@ void BufferView::setExpandedState() } } - -void BufferView::storeExpandedState(const QModelIndex &networkIdx) +void BufferView::storeExpandedState(const QModelIndex& networkIdx) { NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value(); @@ -366,8 +355,7 @@ void BufferView::storeExpandedState(const QModelIndex &networkIdx) _expandedState[networkId] = oldState; } - -void BufferView::setExpandedState(const QModelIndex &networkIdx) +void BufferView::setExpandedState(const QModelIndex& networkIdx) { if (model()->data(networkIdx, NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType) return; @@ -389,10 +377,10 @@ void BufferView::setExpandedState(const QModelIndex &networkIdx) update(networkIdx); setExpanded(networkIdx, expandNetwork); } - storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state + storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state } -void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles) +void BufferView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector& roles) { TreeViewTouch::dataChanged(topLeft, bottomRight, roles); @@ -407,15 +395,13 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott } } - void BufferView::toggleHeader(bool checked) { - auto *action = qobject_cast(sender()); + auto* action = qobject_cast(sender()); header()->setSectionHidden((action->property("column")).toInt(), !checked); } - -void BufferView::contextMenuEvent(QContextMenuEvent *event) +void BufferView::contextMenuEvent(QContextMenuEvent* event) { QModelIndex index = indexAt(event->pos()); if (!index.isValid()) @@ -433,34 +419,31 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) contextMenu.exec(QCursor::pos()); } - -void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) +void BufferView::addActionsToMenu(QMenu* contextMenu, const QModelIndex& index) { QModelIndexList indexList = selectedIndexes(); // make sure the item we clicked on is first indexList.removeAll(index); indexList.prepend(index); - GraphicalUi::contextMenuActionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config()); + GraphicalUi::contextMenuActionProvider()->addActions(contextMenu, indexList, this, &BufferView::menuActionTriggered, (bool)config()); } - -void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) +void BufferView::addFilterActions(QMenu* contextMenu, const QModelIndex& index) { - auto *filter = qobject_cast(model()); + auto* filter = qobject_cast(model()); if (filter) { - QList filterActions = filter->actions(index); + QList filterActions = filter->actions(index); if (!filterActions.isEmpty()) { contextMenu->addSeparator(); - foreach(QAction *action, filterActions) { + foreach (QAction* action, filterActions) { contextMenu->addAction(action); } } } } - -void BufferView::menuActionTriggered(QAction *result) +void BufferView::menuActionTriggered(QAction* result) { ContextMenuActionProvider::ActionType type = (ContextMenuActionProvider::ActionType)result->data().toInt(); switch (type) { @@ -475,19 +458,16 @@ void BufferView::menuActionTriggered(QAction *result) } } - void BufferView::nextBuffer() { changeBuffer(Forward); } - void BufferView::previousBuffer() { changeBuffer(Backward); } - void BufferView::changeBuffer(Direction direction) { QModelIndex currentIndex = selectionModel()->currentIndex(); @@ -496,7 +476,7 @@ void BufferView::changeBuffer(Direction direction) QModelIndex lastNetIndex = model()->index(model()->rowCount() - 1, 0, QModelIndex()); if (currentIndex.parent().isValid()) { - //If we are a child node just switch among siblings unless it's the first/last child + // If we are a child node just switch among siblings unless it's the first/last child resultingIndex = currentIndex.sibling(currentIndex.row() + direction, 0); if (!resultingIndex.isValid()) { @@ -508,19 +488,23 @@ void BufferView::changeBuffer(Direction direction) } } else { - //If we have a toplevel node, try and get an adjacent child + // If we have a toplevel node, try and get an adjacent child if (direction == Backward) { QModelIndex newParent = currentIndex.sibling(currentIndex.row() - 1, 0); if (currentIndex.row() == 0) newParent = lastNetIndex; - if (model()->hasChildren(newParent)) - resultingIndex = newParent.child(model()->rowCount(newParent) - 1, 0); + if (model()->hasChildren(newParent)) { + // Treat an invalid QAbstractItemModel as an invalid QModelIndex + resultingIndex = (newParent.model() ? newParent.model()->index(model()->rowCount(newParent) - 1, 0, newParent) : QModelIndex()); + } else resultingIndex = newParent; } else { - if (model()->hasChildren(currentIndex)) - resultingIndex = currentIndex.child(0, 0); + if (model()->hasChildren(currentIndex)) { + // Treat an invalid QAbstractItemModel as an invalid QModelIndex + resultingIndex = (currentIndex.model() ? currentIndex.model()->index(0, 0, currentIndex) : QModelIndex()); + } else resultingIndex = currentIndex.sibling(currentIndex.row() + 1, 0); } @@ -529,8 +513,10 @@ void BufferView::changeBuffer(Direction direction) if (!resultingIndex.isValid()) { if (direction == Forward) resultingIndex = model()->index(0, 0, QModelIndex()); - else - resultingIndex = lastNetIndex.child(model()->rowCount(lastNetIndex) - 1, 0); + else { + // Assume model is valid + resultingIndex = lastNetIndex.model()->index(model()->rowCount(lastNetIndex) - 1, 0, lastNetIndex); + } } selectionModel()->setCurrentIndex(resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); @@ -562,7 +548,7 @@ void BufferView::selectFirstBuffer() selectionModel()->select(bufferIndex, QItemSelectionModel::ClearAndSelect); } -void BufferView::wheelEvent(QWheelEvent *event) +void BufferView::wheelEvent(QWheelEvent* event) { if (ItemViewSettings().mouseWheelChangesBuffer() == (bool)(event->modifiers() & Qt::AltModifier)) return TreeViewTouch::wheelEvent(event); @@ -571,7 +557,6 @@ void BufferView::wheelEvent(QWheelEvent *event) changeBuffer((Direction)rowDelta); } - void BufferView::hideCurrentBuffer() { QModelIndex index = selectionModel()->currentIndex(); @@ -580,7 +565,7 @@ void BufferView::hideCurrentBuffer() BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); - //The check above means we won't be looking at a network, which should always be the first row, so we can just go backwards. + // The check above means we won't be looking at a network, which should always be the first row, so we can just go backwards. changeBuffer(Backward); config()->requestRemoveBuffer(bufferId); @@ -588,34 +573,14 @@ void BufferView::hideCurrentBuffer() void BufferView::filterTextChanged(const QString& filterString) { - auto *filter = qobject_cast(model()); + auto* filter = qobject_cast(model()); if (!filter) { return; } filter->setFilterString(filterString); - on_configChanged(); // make sure collapsation is correct + on_configChanged(); // make sure collapsation is correct } - -QSize BufferView::sizeHint() const -{ - return TreeViewTouch::sizeHint(); - - if (!model()) - return TreeViewTouch::sizeHint(); - - if (model()->rowCount() == 0) - return QSize(120, 50); - - int columnSize = 0; - for (int i = 0; i < model()->columnCount(); i++) { - if (!isColumnHidden(i)) - columnSize += sizeHintForColumn(i); - } - return QSize(columnSize, 50); -} - - void BufferView::changeHighlight(BufferView::Direction direction) { // If for some weird reason we get a new delegate @@ -631,7 +596,8 @@ void BufferView::changeHighlight(BufferView::Direction direction) if (direction == Backward) { newIndex = indexBelow(newIndex); - } else { + } + else { newIndex = indexAbove(newIndex); } @@ -653,7 +619,8 @@ void BufferView::selectHighlighted() if (_currentHighlight.isValid()) { selectionModel()->setCurrentIndex(_currentHighlight, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); selectionModel()->select(_currentHighlight, QItemSelectionModel::ClearAndSelect); - } else { + } + else { selectFirstBuffer(); } @@ -677,17 +644,15 @@ void BufferView::clearHighlight() class ColorsChangedEvent : public QEvent { public: - ColorsChangedEvent() : QEvent(QEvent::User) {}; + ColorsChangedEvent() + : QEvent(QEvent::User){}; }; - -BufferViewDelegate::BufferViewDelegate(QObject *parent) +BufferViewDelegate::BufferViewDelegate(QObject* parent) : QStyledItemDelegate(parent) -{ -} - +{} -void BufferViewDelegate::customEvent(QEvent *event) +void BufferViewDelegate::customEvent(QEvent* event) { if (event->type() != QEvent::User) return; @@ -695,8 +660,7 @@ void BufferViewDelegate::customEvent(QEvent *event) event->accept(); } - -bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) +bool BufferViewDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index) { if (event->type() != QEvent::MouseButtonRelease) return QStyledItemDelegate::editorEvent(event, model, option, index); @@ -712,7 +676,7 @@ bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, c initStyleOption(&viewOpt, index); QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget); - auto *me = static_cast(event); + auto* me = static_cast(event); if (me->button() != Qt::LeftButton || !checkRect.contains(me->pos())) return QStyledItemDelegate::editorEvent(event, model, option, index); @@ -728,23 +692,22 @@ bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, c return true; } - // ============================== // BufferView Dock // ============================== -BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent) - : QDockWidget(parent), - _childWidget(nullptr), - _widget(new QWidget(parent)), - _filterEdit(new QLineEdit(parent)), - _active(false), - _title(config->bufferViewName()) +BufferViewDock::BufferViewDock(BufferViewConfig* config, QWidget* parent) + : QDockWidget(parent) + , _childWidget(nullptr) + , _widget(new QWidget(parent)) + , _filterEdit(new QLineEdit(parent)) + , _active(false) + , _title(config->bufferViewName()) { setObjectName("BufferViewDock-" + QString::number(config->bufferViewId())); toggleViewAction()->setData(config->bufferViewId()); - setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); - connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &))); - connect(config, SIGNAL(configChanged()), SLOT(configChanged())); + setAllowedAreas(Qt::RightDockWidgetArea | Qt::LeftDockWidgetArea); + connect(config, &BufferViewConfig::bufferViewNameSet, this, &BufferViewDock::bufferViewRenamed); + connect(config, &BufferViewConfig::configChanged, this, &BufferViewDock::configChanged); updateTitle(); _widget->setLayout(new QVBoxLayout); @@ -756,15 +719,16 @@ BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent) _filterEdit->setFocusPolicy(Qt::ClickFocus); _filterEdit->installEventFilter(this); _filterEdit->setPlaceholderText(tr("Search...")); - connect(_filterEdit, SIGNAL(returnPressed()), SLOT(onFilterReturnPressed())); + connect(_filterEdit, &QLineEdit::returnPressed, this, &BufferViewDock::onFilterReturnPressed); _widget->layout()->addWidget(_filterEdit); QDockWidget::setWidget(_widget); } -void BufferViewDock::setLocked(bool locked) { +void BufferViewDock::setLocked(bool locked) +{ if (locked) { - setFeatures(nullptr); + setFeatures({}); } else { setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable); @@ -798,7 +762,7 @@ void BufferViewDock::onFilterReturnPressed() _filterEdit->setVisible(false); } - BufferView *view = bufferView(); + BufferView* view = bufferView(); if (!view) { return; } @@ -806,7 +770,8 @@ void BufferViewDock::onFilterReturnPressed() if (!_filterEdit->text().isEmpty()) { view->selectHighlighted(); _filterEdit->clear(); - } else { + } + else { view->clearHighlight(); } } @@ -822,21 +787,22 @@ void BufferViewDock::setActive(bool active) } } -bool BufferViewDock::eventFilter(QObject *object, QEvent *event) +bool BufferViewDock::eventFilter(QObject* object, QEvent* event) { - if (object != _filterEdit) { - return false; - } + if (object != _filterEdit) { + return false; + } if (event->type() == QEvent::FocusOut) { if (!config()->showSearch() && _filterEdit->text().isEmpty()) { _filterEdit->setVisible(false); return true; } - } else if (event->type() == QEvent::KeyRelease) { + } + else if (event->type() == QEvent::KeyRelease) { auto keyEvent = static_cast(event); - BufferView *view = bufferView(); + BufferView* view = bufferView(); if (!view) { return false; } @@ -869,17 +835,16 @@ bool BufferViewDock::eventFilter(QObject *object, QEvent *event) return false; } -void BufferViewDock::bufferViewRenamed(const QString &newName) +void BufferViewDock::bufferViewRenamed(const QString& newName) { _title = newName; updateTitle(); toggleViewAction()->setText(newName); } - int BufferViewDock::bufferViewId() const { - BufferView *view = bufferView(); + BufferView* view = bufferView(); if (!view) return 0; @@ -889,22 +854,21 @@ int BufferViewDock::bufferViewId() const return 0; } - -BufferViewConfig *BufferViewDock::config() const +BufferViewConfig* BufferViewDock::config() const { - BufferView *view = bufferView(); + BufferView* view = bufferView(); if (!view) return nullptr; else return view->config(); } -void BufferViewDock::setWidget(QWidget *newWidget) +void BufferViewDock::setWidget(QWidget* newWidget) { _widget->layout()->addWidget(newWidget); _childWidget = newWidget; - connect(_filterEdit, SIGNAL(textChanged(QString)), bufferView(), SLOT(filterTextChanged(QString))); + connect(_filterEdit, &QLineEdit::textChanged, bufferView(), &BufferView::filterTextChanged); } void BufferViewDock::activateFilter()