diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2018-11-29 19:52:17 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2018-11-29 21:48:23 +0100 |
commit | 2e5de46030e2354b851ba731f6c76ac30a2e8a3b (patch) | |
tree | e48732e76e7d0ceb4e01caab16c1aa2a119c1ad0 /tderesources/caldav | |
parent | 2f0c49e8523a4d26b6bb9c7c8a05d68cb023a568 (diff) | |
download | tdepim-2e5de46030e2354b851ba731f6c76ac30a2e8a3b.tar.gz tdepim-2e5de46030e2354b851ba731f6c76ac30a2e8a3b.zip |
Adapted to new KPasswordEdit::password() signature.
This relates to bug 2961.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'tderesources/caldav')
-rw-r--r-- | tderesources/caldav/resource.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index dff7ed961..8fae5c984 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -376,14 +376,14 @@ void ResourceCalDav::loadFinished() { if (loader->error()) { if (loader->errorNumber() == -401) { if (NULL != mPrefs) { - TQCString newpass; + TQString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("load error: " + loader->errorString() ); loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } else { // Set new password and try again - mPrefs->setPassword(TQString(newpass)); + mPrefs->setPassword(newpass); startLoading(mPrefs->getFullUrl(), mPrefs->getFullTasksUrl(), mPrefs->getFullJournalsUrl()); } } @@ -424,14 +424,14 @@ void ResourceCalDav::loadFinished() { if (loader->tasksError()) { if (loader->tasksErrorNumber() == -401) { if (NULL != mPrefs) { -// TQCString newpass; +// TQString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->tasksErrorString() ); // loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); // } // else { // // Set new password and try again -// mPrefs->setPassword(TQString(newpass)); +// mPrefs->setPassword(newpass); // startLoading(mPrefs->getFullUrl(), mPrefs->getFullTasksUrl(), mPrefs->getFullJournalsUrl()); // } } @@ -472,14 +472,14 @@ void ResourceCalDav::loadFinished() { if (loader->journalsError()) { if (loader->journalsErrorNumber() == -401) { if (NULL != mPrefs) { -// TQCString newpass; +// TQString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->journalsErrorString() ); // loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); // } // else { // // Set new password and try again -// mPrefs->setPassword(TQString(newpass)); +// mPrefs->setPassword(newpass); // startLoading(mPrefs->getFullUrl(), mPrefs->getFullTasksUrl(), mPrefs->getFullJournalsUrl()); // } } @@ -969,14 +969,14 @@ void ResourceCalDav::writingFinished() { if (mWriter->error() && (abs(mWriter->errorNumber()) != 207)) { if (mWriter->errorNumber() == -401) { if (NULL != mPrefs) { - TQCString newpass; + TQString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("write error: " + mWriter->errorString()); saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } else { // Set new password and try again - mPrefs->setPassword(TQString(newpass)); + mPrefs->setPassword(newpass); startWriting(mPrefs->getFullUrl(), mPrefs->getFullTasksUrl(), mPrefs->getFullJournalsUrl()); } } |