author | mickeyl <mickeyl> | 2004-02-15 18:08:39 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-15 18:08:39 (UTC) |
commit | 4d467f290f7f42717be14bb0f269570fe5dd07bc (patch) (side-by-side diff) | |
tree | 9c50cc710f7f69f57eceece17635b0b5e5b3a0b9 /noncore/net/wellenreiter/gui | |
parent | 76be6ccdc364c609e86d74e6daa72438bc92e911 (diff) | |
download | opie-4d467f290f7f42717be14bb0f269570fe5dd07bc.zip opie-4d467f290f7f42717be14bb0f269570fe5dd07bc.tar.gz opie-4d467f290f7f42717be14bb0f269570fe5dd07bc.tar.bz2 |
s/$1/%1/
Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/main.cpp | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index d32b362..8ef62e9 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp @@ -74,6 +74,8 @@ int main( int argc, char **argv ) - if ( OProcess::processPID( "dhcpc" ) ) + int dhcpid = OProcess::processPID( "dhcpc" ); + + if ( dhcpid ) { result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n" - "This can severly limit scanning!\nShould I kill it for you?" ), + "(PID = %1)\nThis can severly limit scanning!\nShould I kill it for you?" ).arg( dhcpid ), QMessageBox::Yes, QMessageBox::No ); @@ -81,3 +83,3 @@ int main( int argc, char **argv ) { - if ( -1 == ::kill( OProcess::processPID( "dhcpc" ), SIGTERM ) ) + if ( -1 == ::kill( dhcpid, SIGTERM ) ) qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) ); diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index b462afd..72624f7 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp @@ -244,3 +244,3 @@ void WellenreiterMainWindow::demoReadFromGps() - QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n$1" ).arg( loc.dmsPosition() ) ); + QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) ); } |