-rw-r--r-- | noncore/settings/sshkeys/sshkeys.cpp | 15 | ||||
-rw-r--r-- | noncore/settings/sshkeys/sshkeys.h | 10 |
2 files changed, 13 insertions, 12 deletions
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp index e76fd6b..31f6b85 100644 --- a/noncore/settings/sshkeys/sshkeys.cpp +++ b/noncore/settings/sshkeys/sshkeys.cpp @@ -34,4 +34,5 @@ #include <ctype.h> +using namespace Opie::Core; static char *keynames[] = { "identity", "id_rsa", "id_dsa" }; @@ -46,9 +47,9 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); - connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)), + connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(log_sshadd_output(OProcess*,char*,int))); - connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)), + connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); - connect(&addprocess, SIGNAL(processExited(OProcess*)), + connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT(ssh_add_exited(OProcess*))); @@ -87,7 +88,7 @@ void SSHKeysApp::doRefreshListButton() } - connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), + connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(get_list_keys_output(OProcess*,char*,int))); - connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), + connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); @@ -278,7 +279,7 @@ void SSHKeysApp::doRemoveAllButton() OProcess sshadd_process; - connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), + connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(log_sshadd_output(OProcess*,char*,int))); - connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), + connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); diff --git a/noncore/settings/sshkeys/sshkeys.h b/noncore/settings/sshkeys/sshkeys.h index 7483bbc..519f540 100644 --- a/noncore/settings/sshkeys/sshkeys.h +++ b/noncore/settings/sshkeys/sshkeys.h @@ -44,5 +44,5 @@ class SSHKeysApp : public SSHKeysBase QString incoming_keyfingerprint; QString incoming_noise; - OProcess addprocess; + Opie::Core::OProcess addprocess; QString pending_stdout; QString pending_stderr; @@ -52,8 +52,8 @@ class SSHKeysApp : public SSHKeysBase void doRefreshListButton(); void doRemoveAllButton(); - void get_list_keys_output(OProcess *proc, char *buffer, int buflen); - void log_sshadd_output(OProcess *proc, char *buffer, int buflen); - void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen); - void ssh_add_exited(OProcess *proc); + void get_list_keys_output(Opie::Core::OProcess *proc, char *buffer, int buflen); + void log_sshadd_output(Opie::Core::OProcess *proc, char *buffer, int buflen); + void log_sshadd_stderr(Opie::Core::OProcess *proc, char *buffer, int buflen); + void ssh_add_exited(Opie::Core::OProcess *proc); void add_text_changed(const QString &text); }; |