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.cpp | |
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.cpp')
-rw-r--r-- | src/gui/sslerrordialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp index ad33a0949..b6c6e2a24 100644 --- a/src/gui/sslerrordialog.cpp +++ b/src/gui/sslerrordialog.cpp @@ -34,7 +34,7 @@ namespace Utility { } #endif -bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, Account *account) +bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, AccountPtr account) { if (!certs) { qDebug() << "Certs parameter required but is NULL!"; @@ -57,7 +57,7 @@ bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCert return false; } -SslErrorDialog::SslErrorDialog(Account *account, QWidget *parent) : +SslErrorDialog::SslErrorDialog(AccountPtr account, QWidget *parent) : QDialog(parent), _allTrusted(false), _ui(new Ui::SslErrorDialog), _account(account) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |