summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configurationwidget.cpp2
-rw-r--r--configurationwidget.h2
-rw-r--r--filedisplay.cpp6
-rw-r--r--filedisplay.h6
-rw-r--r--filewidget.cpp18
-rw-r--r--origindialog.cpp2
-rw-r--r--origindialog.h2
-rw-r--r--searchdialog.cpp2
-rw-r--r--searchdialog.h2
-rw-r--r--shemovcleaner.cpp2
-rw-r--r--shemovcleaner.h2
-rw-r--r--torrentdisplay.cpp4
-rw-r--r--torrentdisplay.h2
-rw-r--r--torrentwidget.cpp18
-rw-r--r--viewer.cpp5
-rw-r--r--viewer.h2
16 files changed, 36 insertions, 41 deletions
diff --git a/configurationwidget.cpp b/configurationwidget.cpp
index 43188e6..a4af77d 100644
--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
@@ -13,7 +13,7 @@
#include "configurationwidget.h"
#include "itemselectionwidget.h"
-ConfigurationWidget::ConfigurationWidget(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f), mColors(2) {
+ConfigurationWidget::ConfigurationWidget(QWidget *parent) : QDialog(parent), mColors(2) {
//database setup
QGridLayout *dbLayout = new QGridLayout;
mDbHost = new QLineEdit;
diff --git a/configurationwidget.h b/configurationwidget.h
index 5a8590a..90e5e47 100644
--- a/configurationwidget.h
+++ b/configurationwidget.h
@@ -13,7 +13,7 @@ class QCheckBox;
class ConfigurationWidget : public QDialog {
Q_OBJECT
public:
- explicit ConfigurationWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ explicit ConfigurationWidget(QWidget *parent = nullptr);
public slots:
virtual void accept();
diff --git a/filedisplay.cpp b/filedisplay.cpp
index 2b1c6d5..199b4e6 100644
--- a/filedisplay.cpp
+++ b/filedisplay.cpp
@@ -22,7 +22,7 @@
#include "filedisplay.h"
#include "helper.h"
-FileDisplay::FileDisplay(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {
+FileDisplay::FileDisplay(QWidget *parent) : QDialog(parent) {
QTabWidget *tabW = new QTabWidget;
mDBData = new DBData;
mFileData = new FileData;
@@ -71,7 +71,7 @@ void FileDisplay::writeSettings(){
s.setValue("fd/size", size());
}
-DBData::DBData(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) {
+DBData::DBData(QWidget *parent) : QWidget(parent) {
QLabel *seriesNameL = new QLabel(tr("Series"));
mSeriesName = new QLineEdit;
mSeriesName->setReadOnly(true);
@@ -189,7 +189,7 @@ void DBData::gatherData(){
mGenres->setText(genresText);
}
-FileData::FileData(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f){
+FileData::FileData(QWidget *parent) : QWidget(parent){
mView = new QTreeView;
mModel = new QStandardItemModel;
mView->setModel(mModel);
diff --git a/filedisplay.h b/filedisplay.h
index 284c06d..822c502 100644
--- a/filedisplay.h
+++ b/filedisplay.h
@@ -15,7 +15,7 @@ class FileData;
class FileDisplay : public QDialog {
Q_OBJECT
public:
- explicit FileDisplay(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ explicit FileDisplay(QWidget *parent = nullptr);
~FileDisplay();
void setFileData(const QString &fullPath, const QString &md5Sum);
@@ -31,7 +31,7 @@ class FileDisplay : public QDialog {
class DBData : public QWidget {
Q_OBJECT
public:
- explicit DBData(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ explicit DBData(QWidget *parent = nullptr);
void setFileData(const QString &fullPath, const QString &md5Sum);
private:
@@ -46,7 +46,7 @@ class DBData : public QWidget {
class FileData : public QWidget {
Q_OBJECT
public:
- explicit FileData(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ explicit FileData(QWidget *parent = nullptr);
~FileData();
void setFileData(const QString &fullPath);
diff --git a/filewidget.cpp b/filewidget.cpp
index ed3489d..d518867 100644
--- a/filewidget.cpp
+++ b/filewidget.cpp
@@ -5,7 +5,7 @@
#include <QStandardItem>
#include <QTreeView>
#include <QCompleter>
-#include <QDirModel>
+#include <QFileSystemModel>
#include <QDir>
#include <QFileDialog>
#include <QLabel>
@@ -65,7 +65,7 @@ FileWidget::~FileWidget(){
void FileWidget::setupGui(){
mDir = new QLineEdit;
QCompleter *fsCompleter = new QCompleter(this);
- QDirModel *dirModel = new QDirModel(this);
+ QFileSystemModel *dirModel = new QFileSystemModel(this);
fsCompleter->setModel(dirModel);
fsCompleter->setCompletionMode(QCompleter::PopupCompletion);
mDir->setCompleter(fsCompleter);
@@ -74,7 +74,7 @@ void FileWidget::setupGui(){
connect(selDirBtn, &QPushButton::clicked, this, &FileWidget::selectDir);
mFavDirs = new QComboBox;
populateFavDirs();
- connect(mFavDirs, QOverload<const QString &>::of(&QComboBox::activated), [=](const QString &text) { cdAbsolute(text); });
+ connect(mFavDirs, &QComboBox::textActivated, this, [=](const QString &text) { cdAbsolute(text); });
mFilter = new QLineEdit;
connect(mFilter, &QLineEdit::returnPressed, [this] { filter(NameColumn, mFilter->text()); });
@@ -82,7 +82,7 @@ void FileWidget::setupGui(){
connect(searchBtn, &QPushButton::clicked, [this] { filter(NameColumn, mFilter->text()); });
mMimeFilters = new QComboBox;
populateMimeFilters();
- connect(mMimeFilters, QOverload<const QString &>::of(&QComboBox::activated), [this](const QString &text) { filter(MimeColumn, text); });
+ connect(mMimeFilters, &QComboBox::textActivated, this, [this](const QString &text) { filter(MimeColumn, text); });
connect(mMimeFilters, &QComboBox::currentTextChanged, [this](const QString &text) { filter(MimeColumn, text); });
QGridLayout *topL = new QGridLayout;
@@ -122,7 +122,7 @@ void FileWidget::setupGui(){
mOrignDlg = new OriginDialog(this);
connect(mOrignDlg, &OriginDialog::statusMessage, this, &FileWidget::statusMessage);
connect(mOrignDlg, &OriginDialog::refreshNeeded, this, &FileWidget::gatherData);
- mSearchDlg = new SearchDialog(this, nullptr);
+ mSearchDlg = new SearchDialog(this);
mMenuBar = new QMenuBar;
mToolBar = new QToolBar;
mToolBar->setIconSize(QSize(16, 16));
@@ -157,7 +157,7 @@ void FileWidget::createActions(){
mDirUpA->setShortcut(Qt::Key_Backspace);
connect(mDirUpA, &QAction::triggered, this, &FileWidget::cdUp);
mDirBackA = new QAction(QIcon(":/back_dick.png"), tr("Back"), this);
- mDirBackA->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Left));
+ mDirBackA->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Left));
connect(mDirBackA, &QAction::triggered, this, &FileWidget::cdLast);
mCopyA = new QAction(QIcon(":/edit-copy.png"), tr("Copy"), this);
mCopyA->setShortcut(tr("CTRL+C"));
@@ -172,7 +172,7 @@ void FileWidget::createActions(){
mDeleteA->setShortcut(Qt::Key_Delete);
connect(mDeleteA, &QAction::triggered, this, &FileWidget::deleteFiles);
mPropertiesA = new QAction(QIcon(":/diaper.png"), tr("Properties..."), this);
- mPropertiesA->setShortcut(Qt::CTRL + Qt::Key_Return);
+ mPropertiesA->setShortcut(Qt::CTRL | Qt::Key_Return);
connect(mPropertiesA, &QAction::triggered, this, QOverload<>::of(&FileWidget::properties));
mPreviewA = new QAction(QIcon(":/snapshot.png"), tr("Preview..."), this);
connect(mPreviewA, &QAction::triggered, this, &FileWidget::preview);
@@ -290,7 +290,7 @@ void FileWidget::gatherData(){
QDirIterator it(mDir->text(), QDir::Files | QDir::Dirs | QDir::NoDot);
while(it.hasNext()){
- QFileInfo fi = it.next();
+ QFileInfo fi(it.next());
emit statusMessage(gatherMsg.arg(fi.fileName()).arg(QString::number(count)));
CachedFileData *fd = mFileCache[fi.absoluteFilePath()];
if(!fd){
@@ -521,7 +521,7 @@ void FileWidget::filter(int column, QString regexp){
regexp = QString();
}
}
- mProxy->setFilterRegExp(regexp);
+ mProxy->setFilterRegularExpression(regexp);
mProxy->setFilterKeyColumn(column);
mProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
}
diff --git a/origindialog.cpp b/origindialog.cpp
index 607c096..fd1a602 100644
--- a/origindialog.cpp
+++ b/origindialog.cpp
@@ -14,7 +14,7 @@
#include "origindialog.h"
#include "helper.h"
-OriginDialog::OriginDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {
+OriginDialog::OriginDialog(QWidget *parent) : QDialog(parent) {
setupGui();
}
diff --git a/origindialog.h b/origindialog.h
index 6ad499f..7b154cd 100644
--- a/origindialog.h
+++ b/origindialog.h
@@ -10,7 +10,7 @@ class QPushButton;
class OriginDialog : public QDialog {
Q_OBJECT
public:
- explicit OriginDialog(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ explicit OriginDialog(QWidget *parent = nullptr);
signals:
void statusMessage(const QString &msg);
diff --git a/searchdialog.cpp b/searchdialog.cpp
index c558471..fc01ccb 100644
--- a/searchdialog.cpp
+++ b/searchdialog.cpp
@@ -19,7 +19,7 @@
#include "helper.h"
#include "globals.h"
-SearchDialog::SearchDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){
+SearchDialog::SearchDialog(QWidget *parent) : QDialog(parent){
//search bar
QLabel *typeL = new QLabel(tr("Search by:"));
mTypeSel = new QComboBox;
diff --git a/searchdialog.h b/searchdialog.h
index b0ac19b..6ba58cf 100644
--- a/searchdialog.h
+++ b/searchdialog.h
@@ -16,7 +16,7 @@ class SearchDialog : public QDialog {
enum SearchTypes { Filename, Title, Actors };
enum CustomRoles { IdRole = Qt::UserRole + 1 };
enum ChildMode { Actor, Genre };
- explicit SearchDialog(QWidget *parent, Qt::WindowFlags f = nullptr);
+ explicit SearchDialog(QWidget *parent);
virtual ~SearchDialog();
public slots:
diff --git a/shemovcleaner.cpp b/shemovcleaner.cpp
index 32b9d01..95d6c0b 100644
--- a/shemovcleaner.cpp
+++ b/shemovcleaner.cpp
@@ -28,7 +28,7 @@
#include "globals.h"
#include "helper.h"
-ShemovCleaner::ShemovCleaner(QWidget *parent, Qt::WindowFlags f) : QMainWindow(parent, f) {
+ShemovCleaner::ShemovCleaner(QWidget *parent) : QMainWindow(parent) {
//general setup
qApp->setWindowIcon(QIcon(":/clean_tampon.png"));
setMinimumWidth(800);
diff --git a/shemovcleaner.h b/shemovcleaner.h
index 4553df8..9892b1c 100644
--- a/shemovcleaner.h
+++ b/shemovcleaner.h
@@ -13,7 +13,7 @@ class ShemovCleaner : public QMainWindow {
Q_OBJECT
public:
enum Tabs { Torrents = 0, Videos = 1, Actors = 2, Search = 3 };
- ShemovCleaner(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ ShemovCleaner(QWidget *parent = nullptr);
~ShemovCleaner();
public slots:
diff --git a/torrentdisplay.cpp b/torrentdisplay.cpp
index d9c094c..d018c31 100644
--- a/torrentdisplay.cpp
+++ b/torrentdisplay.cpp
@@ -17,7 +17,7 @@
#include "torrentdisplay.h"
-TorrentDisplay::TorrentDisplay(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {
+TorrentDisplay::TorrentDisplay(QWidget *parent) : QDialog(parent) {
//windows doesn't like it after setting up the GUI
setMinimumWidth(600);
@@ -119,7 +119,7 @@ void TorrentDisplay::setData(const QList<QVariant> data, const QString &filename
}
if(it.key() == "creation date"){
uint secs = it.value().toUInt();
- QDateTime when = QDateTime::fromTime_t(secs);
+ QDateTime when = QDateTime::fromSecsSinceEpoch(secs);
mCreated->setText(when.toString(Qt::RFC2822Date));
}
if(it.key() == "encoding"){
diff --git a/torrentdisplay.h b/torrentdisplay.h
index e689312..ad9847e 100644
--- a/torrentdisplay.h
+++ b/torrentdisplay.h
@@ -11,7 +11,7 @@ class QTreeView;
class TorrentDisplay : public QDialog {
Q_OBJECT
public:
- explicit TorrentDisplay(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ explicit TorrentDisplay(QWidget *parent = nullptr);
void setData(const QList<QVariant> data, const QString &filename);
QTreeView *fileView() { return mFileView; }
diff --git a/torrentwidget.cpp b/torrentwidget.cpp
index a118df1..a2ba78f 100644
--- a/torrentwidget.cpp
+++ b/torrentwidget.cpp
@@ -20,7 +20,7 @@
#include <QMenuBar>
#include <QClipboard>
#include <QCompleter>
-#include <QDirModel>
+#include <QFileSystemModel>
#include <QProgressBar>
#include <QApplication>
@@ -42,7 +42,7 @@ TorrentWidget::~TorrentWidget(){
void TorrentWidget::setupGui(){
mDir = new QLineEdit;
QCompleter *torDirCompl = new QCompleter(this);
- torDirCompl->setModel(new QDirModel(torDirCompl));
+ torDirCompl->setModel(new QFileSystemModel(torDirCompl));
mDir->setCompleter(torDirCompl);
connect(mDir, &QLineEdit::returnPressed, this, &TorrentWidget::setDir);
@@ -107,7 +107,7 @@ void TorrentWidget::createActions(){
mMoveA->setShortcut(tr("CTRL+M"));
connect(mMoveA, &QAction::triggered, this, &TorrentWidget::moveFiles);
mTorrentInfoA = new QAction(QIcon(":/huge_bra.png"), tr("Torrent Info..."), this);
- mTorrentInfoA->setShortcut(Qt::CTRL + Qt::Key_Return);
+ mTorrentInfoA->setShortcut(Qt::CTRL | Qt::Key_Return);
connect(mTorrentInfoA, &QAction::triggered, this, &TorrentWidget::torrentInfo);
mSelDirA = new QAction(QIcon(":/folder.png"), tr("Select folder..."), this);
mSelDirA->setShortcut(tr("CTRL+O"));
@@ -406,19 +406,17 @@ void TorrentWidget::guessSubtitle(){
QModelIndex cur = mFileView->selectionModel()->currentIndex();
QClipboard *clip = QApplication::clipboard();
QString curName = cur.data().toString().toLower();
- QRegExp re1(" *\\[.*\\] *");
- re1.setMinimal(true);
+ QRegularExpression re1(" *\\[.*\\] *", QRegularExpression::InvertedGreedinessOption);
curName.replace(re1, "");
- QRegExp re2(" *\\(.*\\) *");
- re2.setMinimal(true);
+ QRegularExpression re2(" *\\(.*\\) *", QRegularExpression::InvertedGreedinessOption);
curName.replace(re2, "");
- QRegExp re3("\\s+");
+ QRegularExpression re3("\\s+");
curName.replace(re3, " ");
curName.replace(".torrent", "");
curName = curName.trimmed();
- QRegExp re4("^shemale\\s*-*");
+ QRegularExpression re4("^shemale\\s*-*");
curName.replace(re4, "");
- QRegExp re5("(\\.mp\\d|rq|\\s*720p|\\s*1080p)");
+ QRegularExpression re5("(\\.mp\\d|rq|\\s*720p|\\s*1080p)");
curName.replace(re5, "");
curName = curName.trimmed();
clip->setText(curName);
diff --git a/viewer.cpp b/viewer.cpp
index 3adde7b..8025401 100644
--- a/viewer.cpp
+++ b/viewer.cpp
@@ -1,6 +1,5 @@
#include <QLabel>
#include <QHBoxLayout>
-#include <QDesktopWidget>
#include <QApplication>
#include <QFileInfo>
#include <QMimeDatabase>
@@ -10,10 +9,8 @@
#include "helper.h"
#include "viewer.h"
-Viewer::Viewer(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f), mCurIndex(-1) {
- QDesktopWidget *dw = qApp->desktop();
+Viewer::Viewer(QWidget *parent) : QWidget(parent), mCurIndex(-1) {
mLabel = new QLabel;
- mLabel->setMaximumSize(dw->size() - QSize(20, 20));
QHBoxLayout *mainLayout = new QHBoxLayout;
mainLayout->addWidget(mLabel);
setLayout(mainLayout);
diff --git a/viewer.h b/viewer.h
index 8bdf471..5e6279e 100644
--- a/viewer.h
+++ b/viewer.h
@@ -7,7 +7,7 @@ class QLabel;
class Viewer : public QWidget {
public:
- Viewer(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ Viewer(QWidget *parent = nullptr);
void setFile(const QString &file, bool allFiles = true);
void preview(const QString &file);
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-04-26 16:12:50 +0000