mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert Mac toolbar to new slot syntax

Browse Source
This commit is contained in:
Felix Kauselmann 2021-06-21 08:01:27 +02:00
parent 47324e7f22
commit 485ce1c9d8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
YACReaderLibrary/library_window.cpp
View File

@ -2176,8 +2176,8 @@ void LibraryWindow::toNormal()
auto timer = new QTimer();
timer->setSingleShot(true);
timer->start();
connect(timer, SIGNAL(timeout()), libraryToolBar, SLOT(show()));
connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
connect(timer, &QTimer::timeout, libraryToolBar, &YACReaderMacOSXToolbar::show);
connect(timer, &QTimer::timeout, timer, &QTimer::deleteLater);
#else
libraryToolBar->show();
#endif

8
custom_widgets/yacreader_macosx_toolbar.mm
View File

@ -188,7 +188,7 @@ void YACReaderMacOSXToolbar::addAction(QAction *action)
QMacToolBarItem *toolBarItem = addItem(action->icon(), action->text());
if (action->data().toString() == TOGGLE_COMICS_VIEW_ACTION_YL)
viewSelector = toolBarItem;
connect(toolBarItem, SIGNAL(activated()), action, SIGNAL(triggered()));
connect(toolBarItem, &QMacToolBarItem::activated, action, [=] { emit action->triggered(); });
NSToolbarItem *nativeItem = toolBarItem->nativeToolBarItem();
actions.insert(QString::fromNSString(nativeItem.itemIdentifier), action);
@ -287,7 +287,7 @@ QAction *YACReaderMacOSXToolbar::addFitToWidthSlider(QAction *attachToAction)
QAction *action = new QAction("", attachToAction->parent());
connect(toolBarItem, SIGNAL(activated()), action, SIGNAL(triggered()));
connect(toolBarItem, &QMacToolBarItem::activated, action, [=] { emit action->triggered(); });
return action;
}
@ -359,8 +359,8 @@ MacToolBarItemWrapper::MacToolBarItemWrapper(QAction *action, QMacToolBarItem *t
: action(action), toolbaritem(toolbaritem)
{
if (action->isCheckable()) {
connect(action, SIGNAL(toggled(bool)), this, SLOT(actionToggled(bool)));
connect(toolbaritem, SIGNAL(activated()), action, SLOT(toggle()));
connect(action, &QAction::toggled, this, &MacToolBarItemWrapper::actionToggled);
connect(toolbaritem, &QMacToolBarItem::activated, action, &QAction::toggle);
updateIcon(action->isChecked());
}
}

2
custom_widgets/yacreader_titled_toolbar.cpp
View File

@ -100,7 +100,7 @@ void YACReaderTitledToolBar::addAction(QAction *action)
pb->setIcon(action->icon());
pb->addAction(action);
connect(pb, SIGNAL(clicked(bool)), action, SIGNAL(triggered(bool)));
connect(pb, &QPushButton::clicked, action, &QAction::triggered);
mainLayout->addWidget(pb);
#else