mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-19 05:24:57 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clazy: Use fixits to refactor some old style signal connections

Browse Source
This commit is contained in:
Felix Kauselmann
2021-06-01 18:14:24 +02:00
parent ca81b5424a
commit 8377de7c3e
49 changed files with 371 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
YACReaderLibrary/comic_vine/api_key_dialog.cpp
View File

@ -23,14 +23,14 @@ ApiKeyDialog::ApiKeyDialog(QWidget *parent)
info->setOpenExternalLinks(true);
edit = new QLineEdit();
edit->setPlaceholderText(tr("Paste here your Comic Vine API key"));
connect(edit, SIGNAL(textChanged(QString)), this, SLOT(enableAccept(QString)));
connect(edit, &QLineEdit::textChanged, this, &ApiKeyDialog::enableAccept);
acceptButton = new QPushButton(tr("Accept"));
acceptButton->setDisabled(true);
connect(acceptButton, SIGNAL(clicked()), this, SLOT(saveApiKey()));
connect(acceptButton, &QAbstractButton::clicked, this, &ApiKeyDialog::saveApiKey);
cancelButton = new QPushButton(tr("Cancel"));
connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
connect(cancelButton, &QAbstractButton::clicked, this, &QDialog::reject);
layout->addWidget(info);
layout->addWidget(edit);

8
YACReaderLibrary/comic_vine/comic_vine_all_volume_comics_retriever.cpp
View File

@ -20,10 +20,10 @@ void ComicVineAllVolumeComicsRetriever::getAllVolumeComics()
void ComicVineAllVolumeComicsRetriever::getAllVolumeComics(int range)
{
HttpWorker *search = new HttpWorker(volumeURLString.arg(range));
connect(search, SIGNAL(dataReady(const QByteArray &)), this, SLOT(appendVolumeComicsInfo(const QByteArray &)));
connect(search, SIGNAL(timeout()), this, SIGNAL(timeOut()));
connect(search, SIGNAL(timeout()), this, SIGNAL(finished()));
connect(search, SIGNAL(finished()), search, SLOT(deleteLater()));
connect(search, &HttpWorker::dataReady, this, &ComicVineAllVolumeComicsRetriever::appendVolumeComicsInfo);
connect(search, &HttpWorker::timeout, this, &ComicVineAllVolumeComicsRetriever::timeOut);
connect(search, &HttpWorker::timeout, this, &ComicVineAllVolumeComicsRetriever::finished);
connect(search, &QThread::finished, search, &QObject::deleteLater);
search->get();
}

36
YACReaderLibrary/comic_vine/comic_vine_client.cpp
View File

@ -64,9 +64,9 @@ ComicVineClient::~ComicVineClient()
void ComicVineClient::search(const QString &query, int page)
{
HttpWorker *search = new HttpWorker(QString(CV_SEARCH).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY, settings->value(COMIC_VINE_API_KEY, CV_API_KEY_DEFAULT).toString()).arg(query).arg(page));
connect(search, SIGNAL(dataReady(const QByteArray &)), this, SLOT(proccessVolumesSearchData(const QByteArray &)));
connect(search, SIGNAL(timeout()), this, SIGNAL(timeOut()));
connect(search, SIGNAL(finished()), search, SLOT(deleteLater()));
connect(search, &HttpWorker::dataReady, this, &ComicVineClient::proccessVolumesSearchData);
connect(search, &HttpWorker::timeout, this, &ComicVineClient::timeOut);
connect(search, &QThread::finished, search, &QObject::deleteLater);
search->get();
}
//CV_SEARCH result
@ -102,18 +102,18 @@ void ComicVineClient::proccessComicDetailData(const QByteArray &data)
void ComicVineClient::getSeriesDetail(const QString &id)
{
HttpWorker *search = new HttpWorker(QString(CV_SERIES_DETAIL).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY, settings->value(COMIC_VINE_API_KEY, CV_API_KEY_DEFAULT).toString()).arg(id));
connect(search, SIGNAL(dataReady(const QByteArray &)), this, SLOT(proccessSeriesDetailData(const QByteArray &)));
connect(search, SIGNAL(timeout()), this, SIGNAL(timeOut()));
connect(search, SIGNAL(finished()), search, SLOT(deleteLater()));
connect(search, &HttpWorker::dataReady, this, &ComicVineClient::proccessSeriesDetailData);
connect(search, &HttpWorker::timeout, this, &ComicVineClient::timeOut);
connect(search, &QThread::finished, search, &QObject::deleteLater);
search->get();
}
void ComicVineClient::getSeriesCover(const QString &url)
{
auto search = new HttpWorker(url);
connect(search, SIGNAL(dataReady(const QByteArray &)), this, SIGNAL(seriesCover(const QByteArray &)));
connect(search, SIGNAL(timeout()), this, SIGNAL(timeOut())); //TODO
connect(search, SIGNAL(finished()), search, SLOT(deleteLater()));
connect(search, &HttpWorker::dataReady, this, &ComicVineClient::seriesCover);
connect(search, &HttpWorker::timeout, this, &ComicVineClient::timeOut); //TODO
connect(search, &QThread::finished, search, &QObject::deleteLater);
search->get();
}
@ -121,9 +121,9 @@ void ComicVineClient::getSeriesCover(const QString &url)
void ComicVineClient::getVolumeComicsInfo(const QString &idVolume, int page)
{
HttpWorker *search = new HttpWorker(QString(CV_COMICS_INFO).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY, settings->value(COMIC_VINE_API_KEY, CV_API_KEY_DEFAULT).toString()).arg(idVolume).arg((page - 1) * 100)); //page doesn't work for search, using offset instead
connect(search, SIGNAL(dataReady(const QByteArray &)), this, SLOT(processVolumeComicsInfo(const QByteArray &)));
connect(search, SIGNAL(timeout()), this, SIGNAL(timeOut())); //TODO
connect(search, SIGNAL(finished()), search, SLOT(deleteLater()));
connect(search, &HttpWorker::dataReady, this, &ComicVineClient::processVolumeComicsInfo);
connect(search, &HttpWorker::timeout, this, &ComicVineClient::timeOut); //TODO
connect(search, &QThread::finished, search, &QObject::deleteLater);
search->get();
}
@ -170,9 +170,9 @@ void ComicVineClient::getComicDetailAsync(const QString &id)
{
HttpWorker *search = new HttpWorker(QString(CV_COMIC_DETAIL).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY, settings->value(COMIC_VINE_API_KEY, CV_API_KEY_DEFAULT).toString()).arg(id));
connect(search, SIGNAL(dataReady(const QByteArray &)), this, SLOT(proccessComicDetailData(const QByteArray &)));
connect(search, SIGNAL(timeout()), this, SIGNAL(timeOut()));
connect(search, SIGNAL(finished()), search, SLOT(deleteLater()));
connect(search, &HttpWorker::dataReady, this, &ComicVineClient::proccessComicDetailData);
connect(search, &HttpWorker::timeout, this, &ComicVineClient::timeOut);
connect(search, &QThread::finished, search, &QObject::deleteLater);
search->get();
}
@ -197,9 +197,9 @@ QByteArray ComicVineClient::getStoryArcDetail(const QString &id, bool &outError,
void ComicVineClient::getComicCover(const QString &url)
{
auto search = new HttpWorker(url);
connect(search, SIGNAL(dataReady(const QByteArray &)), this, SIGNAL(comicCover(QByteArray)));
connect(search, SIGNAL(timeout()), this, SIGNAL(timeOut())); //TODO
connect(search, SIGNAL(finished()), search, SLOT(deleteLater()));
connect(search, &HttpWorker::dataReady, this, &ComicVineClient::comicCover);
connect(search, &HttpWorker::timeout, this, &ComicVineClient::timeOut); //TODO
connect(search, &QThread::finished, search, &QObject::deleteLater);
search->get();
}

32
YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
View File

@ -106,17 +106,17 @@ void ComicVineDialog::doStackedWidgets()
void ComicVineDialog::doConnections()
{
connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
connect(nextButton, SIGNAL(clicked()), this, SLOT(goNext()));
connect(backButton, SIGNAL(clicked()), this, SLOT(goBack()));
connect(searchButton, SIGNAL(clicked()), this, SLOT(search()));
connect(skipButton, SIGNAL(clicked()), this, SLOT(goToNextComic()));
connect(closeButton, &QAbstractButton::clicked, this, &QWidget::close);
connect(nextButton, &QAbstractButton::clicked, this, &ComicVineDialog::goNext);
connect(backButton, &QAbstractButton::clicked, this, &ComicVineDialog::goBack);
connect(searchButton, &QAbstractButton::clicked, this, &ComicVineDialog::search);
connect(skipButton, &QAbstractButton::clicked, this, &ComicVineDialog::goToNextComic);
connect(selectVolumeWidget, SIGNAL(loadPage(QString, int)), this, SLOT(searchVolume(QString, int)));
connect(selectComicWidget, SIGNAL(loadPage(QString, int)), this, SLOT(getVolumeComicsInfo(QString, int)));
connect(sortVolumeComicsWidget, SIGNAL(loadPage(QString, int)), this, SLOT(getVolumeComicsInfo(QString, int)));
connect(selectVolumeWidget, &ScraperSelector::loadPage, this, &ComicVineDialog::searchVolume);
connect(selectComicWidget, &ScraperSelector::loadPage, this, &ComicVineDialog::getVolumeComicsInfo);
connect(sortVolumeComicsWidget, &ScraperSelector::loadPage, this, &ComicVineDialog::getVolumeComicsInfo);
connect(this, SIGNAL(accepted()), this, SLOT(close()), Qt::QueuedConnection);
connect(this, &QDialog::accepted, this, &QWidget::close, Qt::QueuedConnection);
}
void ComicVineDialog::goNext()
@ -749,9 +749,9 @@ void ComicVineDialog::searchVolume(const QString &v, int page)
currentVolumeSearchString = v;
auto comicVineClient = new ComicVineClient;
connect(comicVineClient, SIGNAL(searchResult(QString)), this, SLOT(debugClientResults(QString)));
connect(comicVineClient, SIGNAL(timeOut()), this, SLOT(queryTimeOut()));
connect(comicVineClient, SIGNAL(finished()), comicVineClient, SLOT(deleteLater()));
connect(comicVineClient, &ComicVineClient::searchResult, this, &ComicVineDialog::debugClientResults);
connect(comicVineClient, &ComicVineClient::timeOut, this, &ComicVineDialog::queryTimeOut);
connect(comicVineClient, &ComicVineClient::finished, comicVineClient, &QObject::deleteLater);
comicVineClient->search(v, page);
status = SearchingVolume;
@ -765,11 +765,11 @@ void ComicVineDialog::getVolumeComicsInfo(const QString &vID, int /* page */)
auto comicVineClient = new ComicVineClient;
if (mode == Volume)
connect(comicVineClient, SIGNAL(volumeComicsInfo(QString)), this, SLOT(showSortVolumeComics(QString)));
connect(comicVineClient, &ComicVineClient::volumeComicsInfo, this, &ComicVineDialog::showSortVolumeComics);
else
connect(comicVineClient, SIGNAL(volumeComicsInfo(QString)), this, SLOT(showSelectComic(QString)));
connect(comicVineClient, SIGNAL(timeOut()), this, SLOT(queryTimeOut()));
connect(comicVineClient, SIGNAL(finished()), comicVineClient, SLOT(deleteLater()));
connect(comicVineClient, &ComicVineClient::volumeComicsInfo, this, &ComicVineDialog::showSelectComic);
connect(comicVineClient, &ComicVineClient::timeOut, this, &ComicVineDialog::queryTimeOut);
connect(comicVineClient, &ComicVineClient::finished, comicVineClient, &QObject::deleteLater);
QLOG_TRACE() << vID;

4
YACReaderLibrary/comic_vine/scraper_results_paginator.cpp
View File

@ -24,8 +24,8 @@ ScraperResultsPaginator::ScraperResultsPaginator(QWidget *parent)
previousPage->setIconSize(pp.size());
previousPage->setIcon(pp);
connect(nextPage, SIGNAL(clicked()), this, SIGNAL(loadNextPage()));
connect(previousPage, SIGNAL(clicked()), this, SIGNAL(loadPreviousPage()));
connect(nextPage, &QAbstractButton::clicked, this, &ScraperResultsPaginator::loadNextPage);
connect(previousPage, &QAbstractButton::clicked, this, &ScraperResultsPaginator::loadPreviousPage);
numElements = new QLabel(tr("Number of volumes found : %1"));
numElements->setStyleSheet(labelStylesheet);

2
YACReaderLibrary/comic_vine/scraper_scroll_label.cpp
View File

@ -29,7 +29,7 @@ ScraperScrollLabel::ScraperScrollLabel(QWidget *parent)
"QScrollBar::down-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-down.png') center top no-repeat;}"
"QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical, QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {background: none; }");
connect(textLabel, SIGNAL(linkActivated(QString)), this, SLOT(openLink(QString)));
connect(textLabel, &QLabel::linkActivated, this, &ScraperScrollLabel::openLink);
}
void ScraperScrollLabel::setAltText(const QString &text)

4
YACReaderLibrary/comic_vine/scraper_selector.cpp
View File

@ -4,8 +4,8 @@ ScraperSelector::ScraperSelector(QWidget *parent)
: QWidget(parent)
{
paginator = new ScraperResultsPaginator;
connect(paginator, SIGNAL(loadNextPage()), this, SLOT(loadNextPage()));
connect(paginator, SIGNAL(loadPreviousPage()), this, SLOT(loadPreviousPage()));
connect(paginator, &ScraperResultsPaginator::loadNextPage, this, &ScraperSelector::loadNextPage);
connect(paginator, &ScraperResultsPaginator::loadPreviousPage, this, &ScraperSelector::loadPreviousPage);
}
void ScraperSelector::load(const QString &json, const QString &searchString)

10
YACReaderLibrary/comic_vine/select_comic.cpp
View File

@ -33,7 +33,7 @@ SelectComic::SelectComic(QWidget *parent)
tableComics = new ScraperTableView(this);
//connections
connect(tableComics, SIGNAL(clicked(QModelIndex)), this, SLOT(loadComicInfo(QModelIndex)));
connect(tableComics, &QAbstractItemView::clicked, this, &SelectComic::loadComicInfo);
paginator->setCustomLabel(tr("comics"));
@ -95,13 +95,13 @@ void SelectComic::loadComicInfo(const QModelIndex &mi)
detailLabel->setAltText(loadingStyle.arg(tr("loading description")));
auto comicVineClient = new ComicVineClient;
connect(comicVineClient, SIGNAL(comicCover(const QByteArray &)), this, SLOT(setCover(const QByteArray &)));
connect(comicVineClient, SIGNAL(finished()), comicVineClient, SLOT(deleteLater()));
connect(comicVineClient, &ComicVineClient::comicCover, this, &SelectComic::setCover);
connect(comicVineClient, &ComicVineClient::finished, comicVineClient, &QObject::deleteLater);
comicVineClient->getComicCover(coverURL);
auto comicVineClient2 = new ComicVineClient;
connect(comicVineClient2, SIGNAL(comicDetail(QString)), this, SLOT(setDescription(QString)));
connect(comicVineClient2, SIGNAL(finished()), comicVineClient2, SLOT(deleteLater()));
connect(comicVineClient2, &ComicVineClient::comicDetail, this, &SelectComic::setDescription);
connect(comicVineClient2, &ComicVineClient::finished, comicVineClient2, &QObject::deleteLater);
comicVineClient2->getComicDetailAsync(id);
}

10
YACReaderLibrary/comic_vine/select_volume.cpp
View File

@ -55,7 +55,7 @@ SelectVolume::SelectVolume(QWidget *parent)
//tableVolumes->horizontalHeader()->setSortIndicatorShown(false);
connect(tableVolumes->horizontalHeader(), SIGNAL(sectionClicked(int)), tableVolumes, SLOT(sortByColumn(int)));
//connections
connect(tableVolumes, SIGNAL(clicked(QModelIndex)), this, SLOT(loadVolumeInfo(QModelIndex)));
connect(tableVolumes, &QAbstractItemView::clicked, this, &SelectVolume::loadVolumeInfo);
paginator->setCustomLabel(tr("volumes"));
@ -122,13 +122,13 @@ void SelectVolume::loadVolumeInfo(const QModelIndex &omi)
detailLabel->setAltText(loadingStyle.arg(tr("loading description")));
auto comicVineClient = new ComicVineClient;
connect(comicVineClient, SIGNAL(seriesCover(const QByteArray &)), this, SLOT(setCover(const QByteArray &)));
connect(comicVineClient, SIGNAL(finished()), comicVineClient, SLOT(deleteLater()));
connect(comicVineClient, &ComicVineClient::seriesCover, this, &SelectVolume::setCover);
connect(comicVineClient, &ComicVineClient::finished, comicVineClient, &QObject::deleteLater);
comicVineClient->getSeriesCover(coverURL);
auto comicVineClient2 = new ComicVineClient;
connect(comicVineClient2, SIGNAL(seriesDetail(QString)), this, SLOT(setDescription(QString)));
connect(comicVineClient2, SIGNAL(finished()), comicVineClient2, SLOT(deleteLater()));
connect(comicVineClient2, &ComicVineClient::seriesDetail, this, &SelectVolume::setDescription);
connect(comicVineClient2, &ComicVineClient::finished, comicVineClient2, &QObject::deleteLater);
comicVineClient2->getSeriesDetail(id);
}

16
YACReaderLibrary/comic_vine/sort_volume_comics.cpp
View File

@ -32,8 +32,8 @@ SortVolumeComics::SortVolumeComics(QWidget *parent)
//moveDownButtonIL = new ScrapperToolButton(ScrapperToolButton::RIGHT);
//moveDownButtonIL->setIcon(QIcon(":/images/comic_vine/rowDown.png"));
connect(moveUpButtonCL, SIGNAL(clicked()), this, SLOT(moveUpCL()));
connect(moveDownButtonCL, SIGNAL(clicked()), this, SLOT(moveDownCL()));
connect(moveUpButtonCL, &QAbstractButton::clicked, this, &SortVolumeComics::moveUpCL);
connect(moveDownButtonCL, &QAbstractButton::clicked, this, &SortVolumeComics::moveDownCL);
//connect(moveUpButtonIL,SIGNAL(clicked()),this,SLOT(moveUpIL()));
//connect(moveUpButtonIL,SIGNAL(clicked()),this,SLOT(moveDownIL()));
@ -49,8 +49,8 @@ SortVolumeComics::SortVolumeComics(QWidget *parent)
//content->addWidget(tableVolumes,0,Qt::AlignRight|Qt::AlignTop);
connect(tableVolumeComics->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(synchronizeScroll(int)));
connect(tableFiles->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(synchronizeScroll(int)));
connect(tableVolumeComics->verticalScrollBar(), &QAbstractSlider::valueChanged, this, &SortVolumeComics::synchronizeScroll);
connect(tableFiles->verticalScrollBar(), &QAbstractSlider::valueChanged, this, &SortVolumeComics::synchronizeScroll);
//connect(tableVolumeComics, SIGNAL(pressed(QModelIndex)), tableFiles, SLOT(setCurrentIndex(QModelIndex)));
//connect(tableFiles, SIGNAL(pressed(QModelIndex)), tableVolumeComics, SLOT(setCurrentIndex(QModelIndex)));
@ -93,8 +93,8 @@ SortVolumeComics::SortVolumeComics(QWidget *parent)
tableFiles->addAction(restoreAllItems);
//tableFiles->addAction(restoreItems);
connect(removeItemFromList, SIGNAL(triggered()), this, SLOT(removeSelectedComics()));
connect(restoreAllItems, SIGNAL(triggered()), this, SLOT(restoreAllComics()));
connect(removeItemFromList, &QAction::triggered, this, &SortVolumeComics::removeSelectedComics);
connect(restoreAllItems, &QAction::triggered, this, &SortVolumeComics::restoreAllComics);
//connect(restoreItems,SIGNAL(triggered()),this,SLOT(showRemovedComicsSelector()));
}
@ -136,11 +136,11 @@ void SortVolumeComics::synchronizeScroll(int pos)
if (senderObject == tableVolumeComicsScrollBar) {
disconnect(tableFilesScrollBar, SIGNAL(valueChanged(int)), this, 0);
tableFilesScrollBar->setValue(pos);
connect(tableFilesScrollBar, SIGNAL(valueChanged(int)), this, SLOT(synchronizeScroll(int)));
connect(tableFilesScrollBar, &QAbstractSlider::valueChanged, this, &SortVolumeComics::synchronizeScroll);
} else {
disconnect(tableVolumeComicsScrollBar, SIGNAL(valueChanged(int)), this, 0);
tableVolumeComicsScrollBar->setValue(pos);
connect(tableVolumeComicsScrollBar, SIGNAL(valueChanged(int)), this, SLOT(synchronizeScroll(int)));
connect(tableVolumeComicsScrollBar, &QAbstractSlider::valueChanged, this, &SortVolumeComics::synchronizeScroll);
}
}