diff options
author | Christian Kamm <kamm@incasoftware.de> | 2014-12-18 14:09:48 +0300 |
---|---|---|
committer | Christian Kamm <kamm@incasoftware.de> | 2014-12-18 17:39:51 +0300 |
commit | 38ebfec1fb6814c9516a249ddb69b2816ce224fc (patch) | |
tree | f2be2bf5fcfefa78b4dcfa11d67b07a7cee6be73 /src/gui/sslerrordialog.h | |
parent | 6c7acd585e1a5758180d71de39119db5d890093d (diff) |
Use global Account/AccountState less.
* Use a shared pointer to Account everywhere to ensure
the instance stays alive long enough for a sync to terminate
* Folder is now tied to an AccountState
* SyncEngine and OwncloudPropagator tie to an Account and use that
for all jobs they run
Issue: Since the setup wizard currently always replaces the
account, it will always wipe all folder definitions, even when
the actual changes to the account were minor.
Diffstat (limited to 'src/gui/sslerrordialog.h')
-rw-r--r-- | src/gui/sslerrordialog.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/sslerrordialog.h b/src/gui/sslerrordialog.h index 69a9a1e60..885a1e7b8 100644 --- a/src/gui/sslerrordialog.h +++ b/src/gui/sslerrordialog.h @@ -33,14 +33,14 @@ class SslErrorDialog; class SslDialogErrorHandler : public AbstractSslErrorHandler { public: - bool handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, Account*) Q_DECL_OVERRIDE; + bool handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, AccountPtr) Q_DECL_OVERRIDE; }; class SslErrorDialog : public QDialog { Q_OBJECT public: - explicit SslErrorDialog(Account *account, QWidget *parent = 0); + explicit SslErrorDialog(AccountPtr account, QWidget *parent = 0); ~SslErrorDialog(); bool checkFailingCertsKnown( const QList<QSslError> &errors ); bool trustConnection(); @@ -55,7 +55,7 @@ private: QList<QSslCertificate> _unknownCerts; QString _customConfigHandle; Ui::SslErrorDialog *_ui; - Account *_account; + AccountPtr _account; }; } // end namespace |