dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace all uses of QSignalMapper with lambda expressions

Browse Source
This commit is contained in:
Jonas Kvinge
2019-07-08 22:27:45 +02:00
parent f3e852c042
commit 8ebcb71e6e
13 changed files with 70 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/playlist/playlistheader.cpp
View File

@@ -23,13 +23,11 @@
#include <stdbool.h>
#include <QWidget>
#include <QAbstractItemModel>
#include <QFlags>
#include <QMenu>
#include <QSignalMapper>
#include <QVariant>
#include <QString>
#include <QtAlgorithms>
#include <QMenu>
#include <QAction>
#include <QActionGroup>
#include <QContextMenuEvent>
@@ -41,9 +39,7 @@
PlaylistHeader::PlaylistHeader(Qt::Orientation orientation, PlaylistView *view, QWidget *parent)
: StretchHeaderView(orientation, parent),
view_(view),
menu_(new QMenu(this)),
show_mapper_(new QSignalMapper(this))
{
menu_(new QMenu(this)) {
hide_action_ = menu_->addAction(tr("&Hide..."), this, SLOT(HideCurrent()));
stretch_action_ = menu_->addAction(tr("&Stretch columns to fit window"), this, SLOT(ToggleStretchEnabled()));
@@ -69,7 +65,6 @@ PlaylistHeader::PlaylistHeader(Qt::Orientation orientation, PlaylistView *view,
stretch_action_->setCheckable(true);
stretch_action_->setChecked(is_stretch_enabled());
connect(show_mapper_, SIGNAL(mapped(int)), SLOT(ToggleVisible(int)));
connect(this, SIGNAL(StretchEnabledChanged(bool)), stretch_action_, SLOT(setChecked(bool)));
}
@@ -112,12 +107,12 @@ void PlaylistHeader::AddColumnAction(int index) {
QString title(model()->headerData(index, Qt::Horizontal).toString());
QAction *action = menu_->addAction(title, show_mapper_, SLOT(map()));
QAction *action = menu_->addAction(title);
action->setCheckable(true);
action->setChecked(!isSectionHidden(index));
show_actions_ << action;
show_mapper_->setMapping(action, index);
connect(action, &QAction::triggered, [this, index]() { ToggleVisible(index); } );
}

8
src/playlist/playlistheader.h
View File

@@ -28,14 +28,13 @@
#include <QObject>
#include <QWidget>
#include <QList>
#include <QAction>
#include <QMenu>
#include <QSignalMapper>
#include <QString>
#include <QtEvents>
#include "widgets/stretchheaderview.h"
class QMenu;
class QAction;
class PlaylistView;
class PlaylistHeader : public StretchHeaderView {
@@ -74,7 +73,6 @@ class PlaylistHeader : public StretchHeaderView {
QAction *align_right_action_;
QList<QAction*> show_actions_;
QSignalMapper *show_mapper_;
};
#endif // PLAYLISTHEADER_H