diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-12-02 21:31:58 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-12-02 21:31:58 +0900 |
| commit | f2b042c804e448d0f3d35579de32bd3134733c54 (patch) | |
| tree | 4b6c2494d3946be3ecde127d01533ad2190c61c3 /kexi/main/startup/KexiStartup.cpp | |
| parent | 25c9b225031f0ea7f3f4cd44cd14256b91bf0bc2 (diff) | |
| download | koffice-f2b042c8.tar.gz koffice-f2b042c8.zip | |
Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kexi/main/startup/KexiStartup.cpp')
| -rw-r--r-- | kexi/main/startup/KexiStartup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 66acc0ebe..f47d7da1d 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog() void KexiDBPasswordDialog::done(int r) { if (r == TQDialog::Accepted) { - m_cdata->password = TQString::fromLatin1(password()); + m_cdata->password = password(); } // if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) { /* } else { @@ -330,11 +330,11 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (qstrcmp("--password",argv[i])==0 || qstrcmp("-password",argv[i])==0) { - TQCString pwd(argv[i+1]); + TQString pwd(argv[i+1]); if (!pwd.isEmpty()) { pwd.fill(' '); pwd[0]='x'; - qstrcpy(argv[i+1], (const char*)pwd); + qstrcpy(argv[i+1], (const char*)pwd.utf8().data()); } break; } @@ -394,7 +394,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (d->passwordDialog->showConnectionDetailsRequested() || ret == TQDialog::Accepted) { // if ( ret == TQDialog::Accepted ) { // if (TQDialog::Accepted == KPasswordDialog::getPassword(pwd, msg)) { -//moved cdata.password = TQString(pwd); +//moved cdata.password = pwd; // } } else { m_action = Exit; |