diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2019-06-05 15:50:10 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2019-06-05 15:50:10 +0200 |
| commit | 4a27055106b394f5ff3c3b6d8e4e8798612e85f9 (patch) | |
| tree | 70271962eb33b9d832f89bfce6dd59c9ca42aa54 | |
| parent | 0a577b7d8acacc7838d0faae915af6b78c145ce4 (diff) | |
Node version thing and some nullptr
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/passworddialog.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a9ca3086..02dfbab6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ compiler: env: global: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= +node_js: + - "10" before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt-5.10.1-trusty; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c2d858d..7aa3f277 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -380,6 +380,7 @@ - Two UI Tweaks [\#158](https://github.com/IJHack/QtPass/pull/158) ([lftl](https://github.com/lftl)) - configwindow.ui default/start tab set to "settings" [\#154](https://github.com/IJHack/QtPass/pull/154) ([jounathaen](https://github.com/jounathaen)) - FAQ update concerning button-icons on cinnamon [\#153](https://github.com/IJHack/QtPass/pull/153) ([jounathaen](https://github.com/jounathaen)) +- Cleanup and coding standards [\#120](https://github.com/IJHack/QtPass/pull/120) ([annejan](https://github.com/annejan)) ## [v1.1.0](https://github.com/IJHack/QtPass/tree/v1.1.0) (2016-01-25) [Full Changelog](https://github.com/IJHack/QtPass/compare/v1.0.6...v1.1.0) @@ -424,7 +425,6 @@ - some improvements [\#126](https://github.com/IJHack/QtPass/pull/126) ([retokromer](https://github.com/retokromer)) - added one translation [\#125](https://github.com/IJHack/QtPass/pull/125) ([retokromer](https://github.com/retokromer)) - initial attempt to create a RPM spec file [\#121](https://github.com/IJHack/QtPass/pull/121) ([bram-ivs](https://github.com/bram-ivs)) -- Cleanup and coding standards [\#120](https://github.com/IJHack/QtPass/pull/120) ([annejan](https://github.com/annejan)) - Modified the clipboard logic to allow for on-demand copy to clipboard. [\#119](https://github.com/IJHack/QtPass/pull/119) ([jonhanks](https://github.com/jonhanks)) ## [v1.0.5](https://github.com/IJHack/QtPass/tree/v1.0.5) (2015-11-18) diff --git a/src/passworddialog.h b/src/passworddialog.h index 7b69b350..b38d1b06 100644 --- a/src/passworddialog.h +++ b/src/passworddialog.h @@ -22,8 +22,8 @@ class PasswordDialog : public QDialog { public: explicit PasswordDialog(const PasswordConfiguration &passConfig, - QWidget *parent = 0); - PasswordDialog(const QString &file, const bool &isNew, QWidget *parent = 0); + QWidget *parent = nullptr); + PasswordDialog(const QString &file, const bool &isNew, QWidget *parent = nullptr); ~PasswordDialog(); /*! Sets content in the password field in the interface. |