summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-02-15 18:08:39 (UTC)
committer mickeyl <mickeyl>2004-02-15 18:08:39 (UTC)
commit4d467f290f7f42717be14bb0f269570fe5dd07bc (patch) (unidiff)
tree9c50cc710f7f69f57eceece17635b0b5e5b3a0b9
parent76be6ccdc364c609e86d74e6daa72438bc92e911 (diff)
downloadopie-4d467f290f7f42717be14bb0f269570fe5dd07bc.zip
opie-4d467f290f7f42717be14bb0f269570fe5dd07bc.tar.gz
opie-4d467f290f7f42717be14bb0f269570fe5dd07bc.tar.bz2
s/$1/%1/
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/TODO2
-rw-r--r--noncore/net/wellenreiter/gui/main.cpp8
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp2
3 files changed, 8 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO
index b6ec617..01e731f 100644
--- a/noncore/net/wellenreiter/TODO
+++ b/noncore/net/wellenreiter/TODO
@@ -51,2 +51,4 @@ ENGINE
51 51
52- count/display number of wireless networks / APs since last start/stop
53
52--------- 54---------
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 )
74 74
75 if ( OProcess::processPID( "dhcpc" ) ) 75 int dhcpid = OProcess::processPID( "dhcpc" );
76
77 if ( dhcpid )
76 { 78 {
77 result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n" 79 result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n"
78 "This can severly limit scanning!\nShould I kill it for you?" ), 80 "(PID = %1)\nThis can severly limit scanning!\nShould I kill it for you?" ).arg( dhcpid ),
79 QMessageBox::Yes, QMessageBox::No ); 81 QMessageBox::Yes, QMessageBox::No );
@@ -81,3 +83,3 @@ int main( int argc, char **argv )
81 { 83 {
82 if ( -1 == ::kill( OProcess::processPID( "dhcpc" ), SIGTERM ) ) 84 if ( -1 == ::kill( dhcpid, SIGTERM ) )
83 qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) ); 85 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()
244 244
245 QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n$1" ).arg( loc.dmsPosition() ) ); 245 QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) );
246} 246}