Make it compile with qt6

*BIG FAT WARNING*
Took me a while to figure it out, but the database connection only works
with MINGW64 instead of MINGW32! With the latter loading the SQL Plugin
fails! That said, off to brighter shores :)

1 files changed, 9 insertions, 9 deletions

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);
 }