X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewoverlayfilter.cpp;h=30af03803ee727469ad6aa0a55260dd087b3bbdb;hb=e38846f054ad1766f2e91992a57bbaffd33c7c06;hp=cd918f78fb57cbf8c8e32c84ef10d8f896039c61;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git diff --git a/src/uisupport/bufferviewoverlayfilter.cpp b/src/uisupport/bufferviewoverlayfilter.cpp index cd918f78..30af0380 100644 --- a/src/uisupport/bufferviewoverlayfilter.cpp +++ b/src/uisupport/bufferviewoverlayfilter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "bufferviewoverlayfilter.h" @@ -24,9 +24,9 @@ #include "networkmodel.h" #include "types.h" -BufferViewOverlayFilter::BufferViewOverlayFilter(QAbstractItemModel *model, BufferViewOverlay *overlay) - : QSortFilterProxyModel(model), - _overlay(0) +BufferViewOverlayFilter::BufferViewOverlayFilter(QAbstractItemModel* model, BufferViewOverlay* overlay) + : QSortFilterProxyModel(model) + , _overlay(nullptr) { setOverlay(overlay); setSourceModel(model); @@ -34,14 +34,13 @@ BufferViewOverlayFilter::BufferViewOverlayFilter(QAbstractItemModel *model, Buff setDynamicSortFilter(true); } - -void BufferViewOverlayFilter::setOverlay(BufferViewOverlay *overlay) +void BufferViewOverlayFilter::setOverlay(BufferViewOverlay* overlay) { if (_overlay == overlay) return; if (_overlay) { - disconnect(_overlay, 0, this, 0); + disconnect(_overlay, nullptr, this, nullptr); } _overlay = overlay; @@ -51,19 +50,17 @@ void BufferViewOverlayFilter::setOverlay(BufferViewOverlay *overlay) return; } - connect(overlay, SIGNAL(destroyed()), this, SLOT(overlayDestroyed())); - connect(overlay, SIGNAL(hasChanged()), this, SLOT(invalidate())); + connect(overlay, &QObject::destroyed, this, &BufferViewOverlayFilter::overlayDestroyed); + connect(overlay, &BufferViewOverlay::hasChanged, this, &QSortFilterProxyModel::invalidate); invalidate(); } - void BufferViewOverlayFilter::overlayDestroyed() { - setOverlay(0); + setOverlay(nullptr); } - -bool BufferViewOverlayFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const +bool BufferViewOverlayFilter::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const { if (!_overlay) return false;