Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support Qt 6 (commit 174154b)

This commit is contained in:
Martchus 2020-09-04 00:54:34 +02:00
parent ce0df2d8a3
commit 5e8c230cfb
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gui/mainwindow.cpp
View File

@ -294,10 +294,10 @@ void MainWindow::closeEvent(QCloseEvent *event)
// save settings // save settings
m_settings.beginGroup(QStringLiteral("mainwindow")); m_settings.beginGroup(QStringLiteral("mainwindow"));
m_settings.setValue(QStringLiteral("geometry"), saveGeometry()); m_settings.setValue(QStringLiteral("geometry"), QVariant(saveGeometry()));
m_settings.setValue(QStringLiteral("state"), saveState()); m_settings.setValue(QStringLiteral("state"), QVariant(saveState()));
m_settings.setValue(QStringLiteral("recententries"), m_recentMgr->save()); m_settings.setValue(QStringLiteral("recententries"), QVariant(m_recentMgr->save()));
m_settings.setValue(QStringLiteral("accountfilter"), m_ui->accountFilterLineEdit->text()); m_settings.setValue(QStringLiteral("accountfilter"), QVariant(m_ui->accountFilterLineEdit->text()));
m_settings.setValue(QStringLiteral("alwayscreatebackup"), m_ui->actionAlwaysCreateBackup->isChecked()); m_settings.setValue(QStringLiteral("alwayscreatebackup"), m_ui->actionAlwaysCreateBackup->isChecked());
QString pwVisibility; QString pwVisibility;
if (m_ui->actionShowAlways->isChecked()) { if (m_ui->actionShowAlways->isChecked()) {
@ -307,7 +307,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
} else { } else {
pwVisibility = QStringLiteral("editing"); pwVisibility = QStringLiteral("editing");
} }
m_settings.setValue(QStringLiteral("pwvisibility"), pwVisibility); m_settings.setValue(QStringLiteral("pwvisibility"), QVariant(pwVisibility));
m_settings.endGroup(); m_settings.endGroup();
if (m_qtSettings) { if (m_qtSettings) {
m_qtSettings->save(m_settings); m_qtSettings->save(m_settings);
@ -972,7 +972,7 @@ void MainWindow::addEntry(EntryType type)
QMessageBox::warning(this, QApplication::applicationName(), tr("Unable to create new entry.")); QMessageBox::warning(this, QApplication::applicationName(), tr("Unable to create new entry."));
return; return;
} }
m_entryModel->setData(m_entryModel->index(row, 0, selected), text, Qt::DisplayRole); m_entryModel->setData(m_entryModel->index(row, 0, selected), QVariant(text), Qt::DisplayRole);
setSomethingChanged(true); setSomethingChanged(true);
} }
@ -1001,7 +1001,13 @@ void MainWindow::removeEntry()
*/ */
void MainWindow::applyFilter(const QString &filterText) void MainWindow::applyFilter(const QString &filterText)
{ {
m_entryFilterModel->setFilterRegExp(filterText); m_entryFilterModel->
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
setFilterRegularExpression
#else
setFilterRegExp
#endif
(filterText);
if (filterText.isEmpty()) { if (filterText.isEmpty()) {
applyDefaultExpanding(QModelIndex()); applyDefaultExpanding(QModelIndex());
} else { } else {

4
gui/mainwindow.h
View File

@ -53,7 +53,6 @@ public:
public Q_SLOTS: public Q_SLOTS:
// file management // file management
bool openFile(const QString &path); bool openFile(const QString &path);
bool openFile(const QString &path, Io::PasswordFileOpenFlags openFlags);
void createFile(const QString &path, const QString &password); void createFile(const QString &path, const QString &password);
void createFile(const QString &path); void createFile(const QString &path);
bool createFile(); bool createFile();
@ -69,6 +68,9 @@ public Q_SLOTS:
void showPassowrdGeneratorDialog(); void showPassowrdGeneratorDialog();
void showUndoView(); void showUndoView();
public:
bool openFile(const QString &path, Io::PasswordFileOpenFlags openFlags); // can not be a slot in Qt 6 without further effort, see QTBUG-86424
protected: protected:
bool eventFilter(QObject *obj, QEvent *event) override; bool eventFilter(QObject *obj, QEvent *event) override;
void closeEvent(QCloseEvent *event) override; void closeEvent(QCloseEvent *event) override;