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

New slot syntax: Manually convert leftover QButtons

Browse Source 
There is a bunch of QButton and similar widget connnections which
cannot be converted to new slot syntax automatically.

Fix them by hand and bundle them for testing.
This commit is contained in:
Felix Kauselmann 2021-06-21 08:10:59 +02:00
parent 485ce1c9d8
commit a3a1e32198
8 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReaderLibrary/add_library_dialog.cpp
View File

@ -28,7 +28,7 @@ void AddLibraryDialog::setupUI()
connect(accept, &QAbstractButton::clicked, this, &AddLibraryDialog::add);
cancel = new QPushButton(tr("Cancel"));
connect(cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(cancel, &QPushButton::close, this, &AddLibraryDialog::close);
find = new QPushButton(QIcon(":/images/find_folder.png"), "");
connect(find, &QAbstractButton::clicked, this, &AddLibraryDialog::findPath);

6
YACReaderLibrary/create_library_dialog.cpp
View File

@ -26,11 +26,11 @@ void CreateLibraryDialog::setupUI()
accept = new QPushButton(tr("Create"));
accept->setDisabled(true);
connect(accept, SIGNAL(clicked()), this, SLOT(create()));
connect(accept, &QAbstractButton::clicked, this, &CreateLibraryDialog::create);
cancel = new QPushButton(tr("Cancel"));
connect(cancel, &QAbstractButton::clicked, this, &CreateLibraryDialog::cancelCreate);
connect(cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(cancel, &QAbstractButton::clicked, this, &CreateLibraryDialog::close);
find = new QPushButton(QIcon(":/images/find_folder.png"), "");
connect(find, &QAbstractButton::clicked, this, &CreateLibraryDialog::findPath);
@ -161,7 +161,7 @@ UpdateLibraryDialog::UpdateLibraryDialog(QWidget *parent)
bottom->addWidget(cancel = new QPushButton(tr("Cancel")));
connect(cancel, &QAbstractButton::clicked, this, &UpdateLibraryDialog::cancelUpdate);
connect(cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(cancel, &QAbstractButton::clicked, this, &UpdateLibraryDialog::close);
mainLayout->addStretch();

2
YACReaderLibrary/export_comics_info_dialog.cpp
View File

@ -20,7 +20,7 @@ ExportComicsInfoDialog::ExportComicsInfoDialog(QWidget *parent)
connect(accept, &QAbstractButton::clicked, this, &ExportComicsInfoDialog::exportComicsInfo);
cancel = new QPushButton(tr("Cancel"));
connect(cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(cancel, &QAbstractButton::clicked, this, &ExportComicsInfoDialog::close);
connect(cancel, &QAbstractButton::clicked, this, &QDialog::rejected);
find = new QPushButton(QIcon(":/images/find_folder.png"), "");

2
YACReaderLibrary/export_library_dialog.cpp
View File

@ -17,7 +17,7 @@ ExportLibraryDialog::ExportLibraryDialog(QWidget *parent)
connect(accept, &QAbstractButton::clicked, this, &ExportLibraryDialog::exportLibrary);
cancel = new QPushButton(tr("Cancel"));
connect(cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(cancel, &QAbstractButton::clicked, this, &ExportLibraryDialog::close);
connect(cancel, &QAbstractButton::clicked, this, &QDialog::rejected);
find = new QPushButton(QIcon(":/images/find_folder.png"), "");

4
YACReaderLibrary/import_comics_info_dialog.cpp
View File

@ -22,7 +22,7 @@ ImportComicsInfoDialog::ImportComicsInfoDialog(QWidget *parent)
connect(accept, &QAbstractButton::clicked, this, &ImportComicsInfoDialog::import);
cancel = new QPushButton(tr("Cancel"));
connect(cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(cancel, &QAbstractButton::clicked, this, &ImportComicsInfoDialog::close);
//connect(cancel,SIGNAL(clicked()),this,SIGNAL(rejected()));
find = new QPushButton(QIcon(":/images/find_folder.png"), "");
@ -85,7 +85,7 @@ void ImportComicsInfoDialog::import()
auto importer = new Importer();
importer->source = path->text();
importer->dest = dest;
connect(importer, SIGNAL(finished()), this, SLOT(close()));
connect(importer, &QThread::finished, this, &ImportComicsInfoDialog::close);
connect(importer, &QThread::finished, this, &QWidget::hide);
importer->start();
}

2
YACReaderLibrary/import_library_dialog.cpp
View File

@ -32,7 +32,7 @@ void ImportLibraryDialog::setupUI()
connect(accept, &QAbstractButton::clicked, this, &ImportLibraryDialog::add);
cancel = new QPushButton(tr("Cancel"));
connect(cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(cancel, &QAbstractButton::clicked, this, &ImportLibraryDialog::close);
//connect(cancel,SIGNAL(clicked()),this,SIGNAL(rejected()));
find = new QPushButton(QIcon(":/images/find_folder.png"), "");

5
YACReaderLibrary/rename_library_dialog.cpp
View File

@ -22,10 +22,9 @@ void RenameLibraryDialog::setupUI()
connect(accept, &QAbstractButton::clicked, this, &RenameLibraryDialog::rename);
cancel = new QPushButton(tr("Cancel"));
connect(cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(cancel, &QAbstractButton::clicked, this, &RenameLibraryDialog::close);
auto nameLayout = new QHBoxLayout;
nameLayout->addWidget(newNameLabel);
nameLayout->addWidget(newNameEdit);
@ -71,4 +70,4 @@ void RenameLibraryDialog::close()
newNameEdit->clear();
//accept->setEnabled(false);
QDialog::close();
}
}

2
custom_widgets/yacreader_options_dialog.cpp
View File

@ -40,7 +40,7 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget *parent)
connect(shortcutsButton, &QAbstractButton::clicked, this, &YACReaderOptionsDialog::editShortcuts);
connect(accept, &QAbstractButton::clicked, this, &YACReaderOptionsDialog::saveOptions);
connect(cancel, SIGNAL(clicked()), this, SLOT(restoreOptions())); //TODO fix this
connect(cancel, &QAbstractButton::clicked, this, QOverload<>::of(&YACReaderOptionsDialog::restoreOptions));
connect(cancel, &QAbstractButton::clicked, this, &QWidget::close);
#ifndef NO_OPENGL
useGL = new QCheckBox(tr("Use hardware acceleration (restart needed)"));