1 files changed, 12 insertions, 12 deletions

diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index eeebe7f..e483efe 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -49,13 +49,13 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
   interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces);
   tabWidget->insertTab(interfaceSetup, "TCP/IP");
 
   // Check sanity - the existance of the wireless-tools if-pre-up script
   QFile file(QString(PREUP));
   if (file.exists()) {
-    qWarning(QString("WLANImp: Unable to open /etc/network/if-pre-up.d/wireless-tools"));
+    owarn << QString("WLANImp: Unable to open /etc/network/if-pre-up.d/wireless-tools") << oendl; 
   }
 
   connect( rescanButton, SIGNAL( clicked() ), this, SLOT( rescanNeighbourhood() ) );
   connect( netView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( selectNetwork(QListViewItem*) ) );
   netView->setColumnAlignment( col_chn, AlignCenter );
   netView->setItemMargin( 3 );
@@ -230,13 +230,13 @@ void WLANImp::writeOpts() {
     if(!interfaces->isInterfaceSet()){
         QMessageBox::warning(0,"Inface not set","should not happen!!!");
         return;
     }
     bool error = false;
 
-    qDebug("setting wlan interface %s", interfaces->getInterfaceName( error ).latin1() );
+    odebug << "setting wlan interface " << interfaces->getInterfaceName( error ).latin1() << "" << oendl; 
 
     if (error)  QMessageBox::warning(0,"Inface not set","should not happen!!!");
 
   interfaces->setInterfaceOption(QString("wireless_mode"), mode->currentText());
   interfaces->setInterfaceOption(QString("wireless_essid"), essid->currentText());
 
@@ -304,13 +304,13 @@ void WLANImp::writeOpts() {
  * ... powered by Wellenreiter II technology (C) Michael 'Mickey' Lauer <mickeyl@handhelds.org>
  */
 
 void WLANImp::rescanNeighbourhood()
 {
     QString name = interface->getInterfaceName();
-    qDebug( "rescanNeighbourhood via '%s'", (const char*) name );
+    odebug << "rescanNeighbourhood via '" << (const char*) name << "'" << oendl; 
 
     OWirelessNetworkInterface* wiface = static_cast<OWirelessNetworkInterface*>( ONetwork::instance()->interface( name ) );
     assert( wiface );
 
     // try to guess device type
     QString devicetype;
@@ -327,18 +327,18 @@ void WLANImp::rescanNeighbourhood()
             else if ( line.contains( "prism" ) ) devicetype = "wlan-ng"; /* puke */
             else if ( line.contains( "orinoco" ) ) devicetype = "orinoco";
         }
     }
     if ( devicetype.isEmpty() )
     {
-        qWarning( "rescanNeighbourhood(): couldn't guess device type :(" );
+        owarn << "rescanNeighbourhood(): couldn't guess device type :(" << oendl; 
         return;
     }
     else
     {
-        qDebug( "rescanNeighbourhood(): device type seems to be '%s'", (const char*) devicetype );
+        odebug << "rescanNeighbourhood(): device type seems to be '" << (const char*) devicetype << "'" << oendl; 
     }
 
     // configure interface to receive 802.11 management frames
 
     wiface->setUp( true );
     wiface->setPromiscuousMode( true );
@@ -346,29 +346,29 @@ void WLANImp::rescanNeighbourhood()
     if ( devicetype == "cisco" ) wiface->setMonitoring( new OCiscoMonitoringInterface( wiface, false ) );
     else if ( devicetype == "hostap" ) wiface->setMonitoring( new OHostAPMonitoringInterface( wiface, false ) );
     else if ( devicetype == "wlan-ng" ) wiface->setMonitoring( new OWlanNGMonitoringInterface( wiface, false ) );
     else if ( devicetype == "orinoco" ) wiface->setMonitoring( new OOrinocoMonitoringInterface( wiface, false ) );
     else
     {
-        qDebug( "rescanNeighbourhood(): unsupported device type for monitoring :(" );
+        odebug << "rescanNeighbourhood(): unsupported device type for monitoring :(" << oendl; 
         return;
     }
 
     wiface->setMode( "monitor" );
     if ( wiface->mode() != "monitor" )
     {
-        qWarning( "rescanNeighbourhood(): Unable to bring device into monitor mode (%s).", strerror( errno ) );
+        owarn << "rescanNeighbourhood(): Unable to bring device into monitor mode (" << strerror( errno ) << ")." << oendl; 
         return;
     }
 
     // open a packet capturer
     OPacketCapturer* cap = new OPacketCapturer();
     cap->open( name );
     if ( !cap->isOpen() )
     {
-        qWarning( "rescanNeighbourhood(): Unable to open libpcap (%s).", strerror( errno ) );
+        owarn << "rescanNeighbourhood(): Unable to open libpcap (" << strerror( errno ) << ")." << oendl; 
         return;
     }
 
     // display splash screen
     QFrame* splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize );
     splash->setLineWidth( 2 );
@@ -395,21 +395,21 @@ void WLANImp::rescanNeighbourhood()
 
     for ( int i = 1; i <= wiface->channels(); ++i )
     {
         wiface->setChannel( i );
         pb->setProgress( i );
         qApp->processEvents();
-        qDebug( "rescanNeighbourhood(): listening on channel %d...", i );
+        odebug << "rescanNeighbourhood(): listening on channel " << i << "..." << oendl; 
         OPacket* p = cap->next( 1000 );
         if ( !p )
         {
-            qDebug( "rescanNeighbourhood(): nothing received on channel %d", i );
+            odebug << "rescanNeighbourhood(): nothing received on channel " << i << "" << oendl; 
         }
         else
         {
-            qDebug( "rescanNeighbourhood(): TADAA - something came in on channel %d", i );
+            odebug << "rescanNeighbourhood(): TADAA - something came in on channel " << i << "" << oendl; 
             handlePacket( p );
         }
     }
 
     cap->close();
     wiface->setMode( "managed" ); // TODO: use previous mode
@@ -436,13 +436,13 @@ void WLANImp::handlePacket( OPacket* p )
         else if ( beacon->canESS() )
         {
             type = "managed";
         }
         else
         {
-            qWarning( "handlePacket(): invalid frame [possibly noise] detected!" );
+            owarn << "handlePacket(): invalid frame [possibly noise] detected!" << oendl; 
             return;
         }
 
         OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
         QString essid = ssid ? ssid->ID() : QString("<unknown>");
         OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );