Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-29 19:06:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/yubikey

Browse source
This commit is contained in:
Janek Bevendorff 2017-03-10 18:01:14 +01:00
commit 15dd783d2c
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
119 changed files with 616 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/MainWindow.h
View file

@ -40,7 +40,7 @@ public:
MainWindow();
~MainWindow();
public Q_SLOTS:
public slots:
void openDatabase(const QString& fileName, const QString& pw = QString(),
const QString& keyFile = QString());
void appExit();
@ -54,7 +54,7 @@ protected:
void closeEvent(QCloseEvent* event) override;
void changeEvent(QEvent* event) override;
private Q_SLOTS:
private slots:
void setMenuActionState(DatabaseWidget::Mode mode = DatabaseWidget::None);
void updateWindowTitle();
void showAboutDialog();