author | zecke <zecke> | 2004-03-14 18:51:10 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 18:51:10 (UTC) |
commit | ddfee0836adbd62be48888fbe05e7a79481e81c9 (patch) (unidiff) | |
tree | c423c4f5cd9be39e892a6f3a346dde7c7c4400a9 | |
parent | 617e15d4cdbe7bc962388f9710bce834182bee24 (diff) | |
download | opie-ddfee0836adbd62be48888fbe05e7a79481e81c9.zip opie-ddfee0836adbd62be48888fbe05e7a79481e81c9.tar.gz opie-ddfee0836adbd62be48888fbe05e7a79481e81c9.tar.bz2 |
more ODP and right signal syntax
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/sshkeys/sshkeys.cpp | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 0091a3b..420863c 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -290,16 +290,16 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) | |||
290 | 290 | ||
291 | // Connect up our slots | 291 | // Connect up our slots |
292 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), | 292 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
293 | this, SLOT( processFinished())); | 293 | this, SLOT( processFinished())); |
294 | 294 | ||
295 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 295 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
296 | this, SLOT(commandStdout(OProcess*,char*,int))); | 296 | this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int))); |
297 | 297 | ||
298 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 298 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
299 | this, SLOT(commandStderr(OProcess*,char*,int))); | 299 | this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int))); |
300 | 300 | ||
301 | for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) | 301 | for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) |
302 | { | 302 | { |
303 | *proc << (*it).latin1(); | 303 | *proc << (*it).latin1(); |
304 | } | 304 | } |
305 | 305 | ||
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp index ba96f33..385d355 100644 --- a/noncore/settings/netsystemtime/mainwindow.cpp +++ b/noncore/settings/netsystemtime/mainwindow.cpp | |||
@@ -188,15 +188,15 @@ void MainWindow::runNTP() | |||
188 | } | 188 | } |
189 | 189 | ||
190 | if ( !ntpProcess ) | 190 | if ( !ntpProcess ) |
191 | { | 191 | { |
192 | ntpProcess = new OProcess(); | 192 | ntpProcess = new OProcess(); |
193 | connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 193 | connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
194 | this, SLOT(slotNtpOutput(OProcess*,char*,int)) ); | 194 | this, SLOT(slotNtpOutput(Opie::Core::OProcess*,char*,int)) ); |
195 | connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)), | 195 | connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)), |
196 | this, SLOT(slotNtpFinished(OProcess*)) ); | 196 | this, SLOT(slotNtpFinished(Opie::Core::OProcess*)) ); |
197 | } | 197 | } |
198 | 198 | ||
199 | else | 199 | else |
200 | ntpProcess->clearArguments(); | 200 | ntpProcess->clearArguments(); |
201 | 201 | ||
202 | *ntpProcess << "ntpdate" << srv; | 202 | *ntpProcess << "ntpdate" << srv; |
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp index 31f6b85..cebc845 100644 --- a/noncore/settings/sshkeys/sshkeys.cpp +++ b/noncore/settings/sshkeys/sshkeys.cpp | |||
@@ -44,17 +44,17 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) | |||
44 | 44 | ||
45 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); | 45 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); |
46 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); | 46 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); |
47 | connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); | 47 | connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); |
48 | 48 | ||
49 | connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 49 | connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
50 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 50 | this, SLOT(log_sshadd_output(Opie::Core::OProcess*,char*,int))); |
51 | connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 51 | connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
52 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 52 | this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int))); |
53 | connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)), | 53 | connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)), |
54 | this, SLOT(ssh_add_exited(OProcess*))); | 54 | this, SLOT(ssh_add_exited(Opie::Core::OProcess*))); |
55 | 55 | ||
56 | connect(KeyFileName, SIGNAL(textChanged(const QString&)), | 56 | connect(KeyFileName, SIGNAL(textChanged(const QString&)), |
57 | this, SLOT(add_text_changed(const QString&))); | 57 | this, SLOT(add_text_changed(const QString&))); |
58 | 58 | ||
59 | if (home) { | 59 | if (home) { |
60 | for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) { | 60 | for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) { |
@@ -85,15 +85,15 @@ void SSHKeysApp::doRefreshListButton() | |||
85 | KeyList->takeItem(t); | 85 | KeyList->takeItem(t); |
86 | delete(t); | 86 | delete(t); |
87 | t = next; | 87 | t = next; |
88 | } | 88 | } |
89 | 89 | ||
90 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 90 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
91 | this, SLOT(get_list_keys_output(OProcess*,char*,int))); | 91 | this, SLOT(get_list_keys_output(Opie::Core::OProcess*,char*,int))); |
92 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 92 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
93 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 93 | this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int))); |
94 | 94 | ||
95 | keystate = KeySize; | 95 | keystate = KeySize; |
96 | incoming_keyname=""; | 96 | incoming_keyname=""; |
97 | incoming_keysize=""; | 97 | incoming_keysize=""; |
98 | incoming_keyfingerprint=""; | 98 | incoming_keyfingerprint=""; |
99 | 99 | ||
@@ -276,15 +276,15 @@ void SSHKeysApp::log_text(const char *text) | |||
276 | 276 | ||
277 | void SSHKeysApp::doRemoveAllButton() | 277 | void SSHKeysApp::doRemoveAllButton() |
278 | { | 278 | { |
279 | OProcess sshadd_process; | 279 | OProcess sshadd_process; |
280 | 280 | ||
281 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 281 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
282 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 282 | this, SLOT(log_sshadd_output(Opie::Core::OProcess*,char*,int))); |
283 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 283 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
284 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 284 | this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int))); |
285 | 285 | ||
286 | // log_text(tr("Running ssh-add -D")); | 286 | // log_text(tr("Running ssh-add -D")); |
287 | sshadd_process << "ssh-add" << "-D"; | 287 | sshadd_process << "ssh-add" << "-D"; |
288 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); | 288 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); |
289 | if (!ret) { | 289 | if (!ret) { |
290 | log_text(tr("Error running ssh-add")); | 290 | log_text(tr("Error running ssh-add")); |