diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-28 00:04:05 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-28 00:04:05 +0900 |
commit | 6ae10fc66ed3c35e98e49bac8bf6670f0a9e2d6b (patch) | |
tree | 154aa555033fe887b9b56d8a559000c89b166f1e /tdesu | |
parent | 3c2da5f0e188e1f1152da840bdf8d94ceb509671 (diff) | |
download | tdebase-6ae10fc66ed3c35e98e49bac8bf6670f0a9e2d6b.tar.gz tdebase-6ae10fc66ed3c35e98e49bac8bf6670f0a9e2d6b.zip |
Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdesu')
-rw-r--r-- | tdesu/tdesu/sudlg.cpp | 4 | ||||
-rw-r--r-- | tdesu/tdesu/sudlg.h | 2 | ||||
-rw-r--r-- | tdesu/tdesu/tdesu.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tdesu/tdesu/sudlg.cpp b/tdesu/tdesu/sudlg.cpp index 934930814..e17b3168d 100644 --- a/tdesu/tdesu/sudlg.cpp +++ b/tdesu/tdesu/sudlg.cpp @@ -67,11 +67,11 @@ TDEsuDialog::~TDEsuDialog() { } -bool TDEsuDialog::checkPassword(const char *password) +bool TDEsuDialog::checkPassword(const TQString &password) { SuProcess proc; proc.setUser(m_User); - int status = proc.checkInstall(password); + int status = proc.checkInstall(password.utf8()); switch (status) { case -1: diff --git a/tdesu/tdesu/sudlg.h b/tdesu/tdesu/sudlg.h index 32d466105..08f4e608a 100644 --- a/tdesu/tdesu/sudlg.h +++ b/tdesu/tdesu/sudlg.h @@ -21,7 +21,7 @@ public: enum ResultCodes { AsUser = 10 }; protected: - bool checkPassword(const char *password); + bool checkPassword(const TQString &password); void slotUser1(); private: diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index d75c0e83a..2849b4c62 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -344,7 +344,7 @@ static int startApp() } // Start the dialog - TQCString password; + TQString password; if (needpw) { TDEStartupInfoId id; @@ -391,7 +391,7 @@ static int startApp() } else if (keep && have_daemon) { - client.setPass(password, timeout); + client.setPass(password.utf8(), timeout); client.setPriority(priority); client.setScheduler(scheduler); int result = client.exec(command, user, options, env); @@ -415,7 +415,7 @@ static int startApp() proc.setPriority(priority); proc.setScheduler(scheduler); proc.setCommand(command); - int result = proc.exec(password); + int result = proc.exec(password.utf8()); return result; } return -1; |