diff options
author | Arno <arno@disconnect.de> | 2022-04-15 13:27:34 +0200 |
---|---|---|
committer | Arno <arno@disconnect.de> | 2022-04-15 13:27:34 +0200 |
commit | 856119c5a43b4781b051b93a0713c152cfd99f85 (patch) | |
tree | 4e2fde4e7a76179cc243e0665091c6ad429ea640 /moviewidget.cpp | |
parent | 62d3ca1482b202d2883eeb5e17e72300e8612477 (diff) | |
download | SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.gz SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.bz2 SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.zip |
Make it run with Qt6
This is a huge commit. Changes:
* Obviously, make it compile
* Make it run (only scarcely tested)
* get rid of most of clang's warnings
Let's see what surprises are in store...
Diffstat (limited to 'moviewidget.cpp')
-rw-r--r-- | moviewidget.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/moviewidget.cpp b/moviewidget.cpp index fe85e37..cb419ba 100644 --- a/moviewidget.cpp +++ b/moviewidget.cpp @@ -46,10 +46,10 @@ void MovieWidget::setupWidget(){ transform.rotate(-180); QIcon buttplugLeft(buttplug.transformed(transform)); QAction *backA = new QAction(buttplugLeft, tr("Prev. archive selection"), this); - connect(backA, &QAction::triggered, [=] { forwardSelection(-1) ;}); + connect(backA, &QAction::triggered, this, [=] { forwardSelection(-1) ;}); toolbar->addAction(backA); QAction *forwardA = new QAction(buttplugRight, tr("Next archive selection"), this); - connect(forwardA, &QAction::triggered, [=] { forwardSelection(1); }); + connect(forwardA, &QAction::triggered, this, [=] { forwardSelection(1); }); toolbar->addAction(forwardA); toolbar->addSeparator(); QAction *deleteA = new QAction(QIcon(":/delete.png"), tr("Delete"), this); @@ -64,14 +64,14 @@ void MovieWidget::setupWidget(){ QLabel *filterL = new QLabel(tr("Filter")); mFilterLE = new QLineEdit; - connect(mFilterLE, &QLineEdit::returnPressed, [=] { mTopProxy->setFilterRegExp(QRegExp(mFilterLE->text())); }); + connect(mFilterLE, &QLineEdit::returnPressed, this, [=] { mTopProxy->setFilterRegularExpression(mFilterLE->text()); }); QToolBar *filterTB = new QToolBar; QAction *doFilter = new QAction(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2245), true, false), tr("Filter"), this); - connect(doFilter, &QAction::triggered, [=] { mTopProxy->setFilterRegExp(QRegExp(mFilterLE->text())); }); + connect(doFilter, &QAction::triggered, this, [=] { mTopProxy->setFilterRegularExpression(mFilterLE->text()); }); QAction *clearFilter = new QAction(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2694), true, false), tr("Clear"), this); - connect(clearFilter, &QAction::triggered, [=] { + connect(clearFilter, &QAction::triggered, this, [=] { mFilterLE->clear(); - mTopProxy->setFilterRegExp(QString()); + mTopProxy->setFilterRegularExpression(QString()); }); filterTB->addAction(doFilter); filterTB->addAction(clearFilter); @@ -80,7 +80,7 @@ void MovieWidget::setupWidget(){ mSelectionCB = new QComboBox; QStringList selections = QStringList() << tr("Actors") << tr("Genres") << tr("Series"); mSelectionCB->addItems(selections); - connect(mSelectionCB, &QComboBox::currentTextChanged, [=] { selectBy(mSelectionCB->currentText()); }); + connect(mSelectionCB, &QComboBox::currentTextChanged, this, [=] { selectBy(mSelectionCB->currentText()); }); QHBoxLayout *topWL = new QHBoxLayout; topWL->addWidget(filterL); @@ -123,11 +123,11 @@ void MovieWidget::setupWidget(){ QAction *editFileA = new QAction(QIcon(":/huge_bra_light.png"), tr("Edit file..."), this); connect(editFileA, &QAction::triggered, this, &MovieWidget::editFile); QAction *filenameToClipA = new QAction(tr("Filename to clip"), this); - connect(filenameToClipA, &QAction::triggered, [=] { copyToClipboard(FilenameRole); }); + connect(filenameToClipA, &QAction::triggered, this, [=] { copyToClipboard(FilenameRole); }); QAction *fullpathToClipA = new QAction(tr("Full path to clip"), this); - connect(fullpathToClipA, &QAction::triggered, [=] { copyToClipboard(FullPathRole); }); + connect(fullpathToClipA, &QAction::triggered, this, [=] { copyToClipboard(FullPathRole); }); QAction *md5ToClipA = new QAction(tr("MD5 to clip"), this); - connect(md5ToClipA, &QAction::triggered, [=] { copyToClipboard(MD5SumRole); }); + connect(md5ToClipA, &QAction::triggered, this, [=] { copyToClipboard(MD5SumRole); }); mBottomView->addActions(QList<QAction*>() << playSelectedA << Helper::createSeparator(this) << editFileA << Helper::createSeparator(this) << filenameToClipA << fullpathToClipA << md5ToClipA); @@ -155,7 +155,7 @@ void MovieWidget::readSettings(){ QString filter = s.value("mw/filter").toString(); mFilterLE->setText(filter); if(!filter.isEmpty()){ - mTopProxy->setFilterRegExp(QRegExp(mFilterLE->text())); + mTopProxy->setFilterRegularExpression(mFilterLE->text()); } } @@ -192,7 +192,7 @@ void MovieWidget::deleteSeries(){ deleteId.prepare("DELETE FROM seriesparts WHERE iseriesparts_id = :id"); deleteId.bindValue(":id", partId); if(deleteId.exec()){ - for(QString f : fullPaths){ + for(const auto &f : fullPaths){ if(!QFile::remove(f)){ db.rollback(); return; |