From 79d004c42bc0c67771bea44f964cbd406dda194c Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Tue, 22 Jun 2021 12:33:54 +0200 Subject: [PATCH] ComicViews: Convert to new syntax, add clazy exception for QML signals --- YACReaderLibrary/classic_comics_view.cpp | 5 +++-- YACReaderLibrary/info_comics_view.cpp | 5 +++-- YACReaderLibrary/yacreader_comics_views_manager.cpp | 13 ++++++------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp index 6e91ea30..6dbce64f 100644 --- a/YACReaderLibrary/classic_comics_view.cpp +++ b/YACReaderLibrary/classic_comics_view.cpp @@ -135,8 +135,9 @@ void ClassicComicsView::setModel(ComicModel *model) } else { connect(model, &QAbstractItemModel::dataChanged, this, &ClassicComicsView::applyModelChanges, Qt::UniqueConnection); connect(model, &QAbstractItemModel::rowsRemoved, this, &ClassicComicsView::removeItemsFromFlow, Qt::UniqueConnection); - connect(model, SIGNAL(resortedIndexes(QList)), comicFlow, SLOT(resortCovers(QList)), Qt::UniqueConnection); - connect(model, SIGNAL(newSelectedIndex(QModelIndex)), this, SLOT(setCurrentIndex(QModelIndex)), Qt::UniqueConnection); + //TODO: Missing method resortCovers? + connect(model, &ComicModel::resortedIndexes, comicFlow, &ComicFlowWidget::resortCovers, Qt::UniqueConnection); + connect(model, &ComicModel::newSelectedIndex, this, &ClassicComicsView::setCurrentIndex, Qt::UniqueConnection); tableView->setModel(model); if (model->rowCount() > 0) diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp index 5aa5191c..d016284d 100644 --- a/YACReaderLibrary/info_comics_view.cpp +++ b/YACReaderLibrary/info_comics_view.cpp @@ -82,8 +82,9 @@ InfoComicsView::InfoComicsView(QWidget *parent) flow = rootObject->findChild("flow"); list = rootObject->findChild("list"); - connect(flow, SIGNAL(currentCoverChanged(int)), this, SLOT(updateInfoForIndex(int))); - connect(flow, SIGNAL(currentCoverChanged(int)), this, SLOT(setCurrentIndex(int))); + // QML signals only work with old style signal slot syntax + connect(flow, SIGNAL(currentCoverChanged(int)), this, SLOT(updateInfoForIndex(int))); // clazy:exclude=old-style-connect + connect(flow, SIGNAL(currentCoverChanged(int)), this, SLOT(setCurrentIndex(int))); // clazy:exclude=old-style-connect selectionHelper = new YACReaderComicsSelectionHelper(this); comicInfoHelper = new YACReaderComicInfoHelper(this); diff --git a/YACReaderLibrary/yacreader_comics_views_manager.cpp b/YACReaderLibrary/yacreader_comics_views_manager.cpp index a28769e5..d1c59ad7 100644 --- a/YACReaderLibrary/yacreader_comics_views_manager.cpp +++ b/YACReaderLibrary/yacreader_comics_views_manager.cpp @@ -59,9 +59,8 @@ YACReaderComicsViewsManager::YACReaderComicsViewsManager(QSettings *settings, Li comicsViewStack->setCurrentWidget(comicsView); //connections - - connect(emptyFolderWidget, SIGNAL(copyComicsToCurrentFolder(QList>)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList>))); - connect(emptyFolderWidget, SIGNAL(moveComicsToCurrentFolder(QList>)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList>))); + connect(emptyFolderWidget, &EmptyFolderWidget::copyComicsToCurrentFolder, libraryWindow, &LibraryWindow::copyAndImportComicsToCurrentFolder); + connect(emptyFolderWidget, &EmptyFolderWidget::moveComicsToCurrentFolder, libraryWindow, &LibraryWindow::moveAndImportComicsToCurrentFolder); } QWidget *YACReaderComicsViewsManager::containerWidget() @@ -135,8 +134,8 @@ void YACReaderComicsViewsManager::disconnectComicsViewConnections(ComicsView *wi disconnect(widget, &ComicsView::selected, libraryWindow, QOverload<>::of(&LibraryWindow::openComic)); disconnect(widget, &ComicsView::openComic, libraryWindow, QOverload::of(&LibraryWindow::openComic)); disconnect(libraryWindow->selectAllComicsAction, &QAction::triggered, widget, &ComicsView::selectAll); - disconnect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList>)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList>))); - disconnect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList>)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList>))); + disconnect(comicsView, &ComicsView::copyComicsToCurrentFolder, libraryWindow, &LibraryWindow::copyAndImportComicsToCurrentFolder); + disconnect(comicsView, &ComicsView::moveComicsToCurrentFolder, libraryWindow, &LibraryWindow::moveAndImportComicsToCurrentFolder); disconnect(comicsView, &ComicsView::customContextMenuViewRequested, libraryWindow, &LibraryWindow::showComicsViewContextMenu); disconnect(comicsView, &ComicsView::customContextMenuItemRequested, libraryWindow, &LibraryWindow::showComicsItemContextMenu); } @@ -153,8 +152,8 @@ void YACReaderComicsViewsManager::doComicsViewConnections() connect(comicsView, &ComicsView::customContextMenuViewRequested, libraryWindow, &LibraryWindow::showComicsViewContextMenu); connect(comicsView, &ComicsView::customContextMenuItemRequested, libraryWindow, &LibraryWindow::showComicsItemContextMenu); //Drops - connect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList>)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList>))); - connect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList>)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList>))); + connect(comicsView, &ComicsView::copyComicsToCurrentFolder, libraryWindow, &LibraryWindow::copyAndImportComicsToCurrentFolder); + connect(comicsView, &ComicsView::moveComicsToCurrentFolder, libraryWindow, &LibraryWindow::moveAndImportComicsToCurrentFolder); } void YACReaderComicsViewsManager::switchToComicsView(ComicsView *from, ComicsView *to)