convert to Opie Debugging Framework

5 files changed, 50 insertions, 50 deletions

diff --git a/noncore/settings/networksettings/wlan/infoimp.cpp b/noncore/settings/networksettings/wlan/infoimp.cpp
index bd56678..c558f5e 100644
--- a/noncore/settings/networksettings/wlan/infoimp.cpp
+++ b/noncore/settings/networksettings/wlan/infoimp.cpp
@@ -10,13 +10,13 @@
  * start a timer that every second will update the information.
  */ 
 WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInfo(parent, name, fl){
   WExtensions *wExtensions = new WExtensions(name);
   if(!wExtensions->doesHaveWirelessExtensions()){
     delete  wExtensions;
-    qDebug("WlanInfoImp::No wireless extension");
+    odebug << "WlanInfoImp::No wireless extension" << oendl; 
     return;
   }
   delete  wExtensions;
   timer = new QTimer( this );
   connect( timer, SIGNAL(timeout()), this, SLOT(update()));
   timer->start( 1000, false );    
@@ -25,13 +25,13 @@ WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInf
 /**
  * Updates the information about the wireless device.
  */ 
 void WlanInfoImp::update(){
   WExtensions *wExtensions = new WExtensions(this->name());
   if(!wExtensions->doesHaveWirelessExtensions()){
-    qDebug("No extension");
+    odebug << "No extension" << oendl; 
     delete wExtensions;
     timer->stop();
     return;
   }
   essidLabel->setText(wExtensions->essid());
   apLabel->setText(wExtensions->ap());
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index d1fff88..9c64323 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -109,13 +109,13 @@ int WExtensions::channel(){
   for(int channel = 1;  channel<= 15; channel++){
     if( num >= left && num <= right )
       return channel;
     left += 0.005;
     right += 0.005;
   }
-  qDebug(QString("Unknown frequency: %1, returning -1 for the channel.").arg(num).latin1());
+  odebug << QString("Unknown frequency: %1, returning -1 for the channel.").arg(num).latin1() << oendl; 
   return -1;
 }
 
 /***
  * Get the current rate that the card is transmiting at.
  * @return double the rate, 0 if error.
@@ -174,26 +174,26 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){
   wstream.readLine();  // skip the first two lines
   wstream.readLine();  // because they only contain headers
   while(!wstream.atEnd()){
     wstream >> name >> status >> quality >> c >> signal >> c >> noise;
     if(name == QString("%1:").arg(interface)){
       if ( quality > 92 )
-        qDebug( "WIFIAPPLET: D'oh! Quality %d > estimated max!\n", quality );
+        odebug << "WIFIAPPLET: D'oh! Quality " << quality << " > estimated max!\n" << oendl; 
       if ( ( signal > IW_UPPER ) || ( signal < IW_LOWER ) )
-        qDebug( "WIFIAPPLET: Doh! Strength %d > estimated max!\n", signal );
+        odebug << "WIFIAPPLET: Doh! Strength " << signal << " > estimated max!\n" << oendl; 
       if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) )
-        qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise );
-      //qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1());
+        odebug << "WIFIAPPLET: Doh! Noise " << noise << " > estimated max!\n" << oendl; 
+      //odebug << QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1() << oendl; 
       signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER;
       noise = ( ( noise-IW_LOWER ) * 100 ) / IW_UPPER;
       quality = ( quality*100 ) / 92;
       return true;
     }  
   }
 
-  qDebug("WExtensions::statsCard no longer present.");
+  odebug << "WExtensions::statsCard no longer present." << oendl; 
   quality = -1;
   signal = IW_LOWER;
   noise = IW_LOWER;
   return false;
 }
 
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 80a9927..fe7941d 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -42,13 +42,13 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
     }
     file.close();
     settingsFileText = QStringList::split("\n", line, true);
     parseSettingFile();
   }
   else
-    qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1());
+    odebug << QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1() << oendl; 
   connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
 }
 
 void WLANImp::typeChanged(int mod){
   networkChannel->setEnabled(mod);
   channelLabel->setEnabled(mod);
@@ -143,13 +143,13 @@ void WLANImp::parseSettingFile(){
 void WLANImp::changeAndSaveSettingFile(){
   QString wlanFile = WIRELESS_OPTS;
   QFile::remove(wlanFile);
   QFile file(wlanFile);
 
   if (!file.open(IO_ReadWrite)){
-    qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1());
+    odebug << QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1() << oendl; 
     return;
   }
 
   QTextStream stream( &file );
   bool foundCase = false;
   bool found = false;
@@ -233,13 +233,13 @@ void WLANImp::accept(){
   OProcess insert;
   insert << "sh";
   insert << "-c";
   insert << "cardctl eject && cardctl insert";
 
   if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) {
-    qWarning("could not start cardctl");
+    owarn << "could not start cardctl" << oendl; 
   }
 
   // Close out the dialog
   QDialog::accept();
 }
 
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" ) );
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 74d7f8e..886af10 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -119,59 +119,59 @@ bool WLANModule::remove(Interface*){
   // Can't remove a hardware device, you can stop it though.
   return false;
 }
 
 void WLANModule::receive(const QCString &param, const QByteArray &arg)
 {
-    qDebug("WLANModule::receive "+param);
+    odebug << "WLANModule::receive "+param << oendl; 
     QStringList params = QStringList::split(",",param);
     int count = params.count();
-    qDebug("WLANModule got %i params", count );
+    odebug << "WLANModule got " << count << " params" << oendl; 
     if (count < 2){
-        qDebug("Erorr less than 2 parameter");
-        qDebug("RETURNING");
+        odebug << "Erorr less than 2 parameter" << oendl; 
+        odebug << "RETURNING" << oendl; 
         return;
     }
 
     QDataStream stream(arg,IO_ReadOnly);
     QString interface;
     QString action;
     int countMsgs = 0;
     stream >> interface;
-    qDebug("got count? >%s<",interface.latin1());
+    odebug << "got count? >" << interface.latin1() << "<" << oendl; 
     if (interface == "count"){
-        qDebug("got count");
+        odebug << "got count" << oendl; 
         stream >> action;
-        qDebug("Got count num >%s<", action.latin1());
+        odebug << "Got count num >" << action.latin1() << "<" << oendl; 
         countMsgs = action.toInt();
     }
 
     QDialog *toShow;
     //while (! stream.atEnd() ){
     for (int i = 0; i < countMsgs; i++){
-        qDebug("start stream %d/%d",i,countMsgs);
+        odebug << "start stream " << i << "/" << countMsgs << "" << oendl; 
         if (stream.atEnd()){
-            qDebug("end of stream");
+            odebug << "end of stream" << oendl; 
             return;
         }
         stream >> interface;
-        qDebug("got iface");
+        odebug << "got iface" << oendl; 
         stream >> action;
-        qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1());
+        odebug << "WLANModule got interface " << interface.latin1() << " and acion " << action.latin1() << "" << oendl; 
         // find interfaces
         Interface *ifa=0;
         for ( Interface *i=list.first(); i != 0; i=list.next() ){
             if (i->getInterfaceName() == interface){
-                qDebug("WLANModule found interface %s",interface.latin1());
+                odebug << "WLANModule found interface " << interface.latin1() << "" << oendl; 
                 ifa = i;
             }
         }
 
         if (ifa == 0){
-            qDebug("WLANModule Did not find %s",interface.latin1());
-            qDebug("skipping");
+            odebug << "WLANModule Did not find " << interface.latin1() << "" << oendl; 
+            odebug << "skipping" << oendl; 
             count = 0;
         }
 
         if (count == 2){
             // those should call the interface directly
             QWidget *info = getInfo( ifa );
@@ -192,15 +192,15 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
                 //FIXME: what if it got closed meanwhile?
                 wlanconfigWiget = (WLANImp*) configure(ifa);
                 toShow = (QDialog*) wlanconfigWiget;
             }
             QPEApplication::showWidget( wlanconfigWiget );
             stream >> value;
-            qDebug("WLANModule (build 4) is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
+            odebug << "WLANModule (build 4) is setting " << action.latin1() << " of " << interface.latin1() << " to " << value.latin1() << "" << oendl; 
             if (value.isEmpty()){
-                qDebug("value is empty!!!\nreturning");
+                odebug << "value is empty!!!\nreturning" << oendl; 
                 return;
             }
             if ( action.contains("ESSID") ){
                 QComboBox *combo = wlanconfigWiget->essid;
                 bool found = false;
                 for ( int i = 0; i < combo->count(); i++)
@@ -215,41 +215,41 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
                     if ( combo->text( i ) == value ){
                     combo->setCurrentItem( i );
                     }
 
             }else if (action.contains("Channel")){
                 bool ok;
-                qDebug("converting channel");
+                odebug << "converting channel" << oendl; 
                 int chan = value.toInt( &ok );
                 if (ok){
-                    qDebug("ok setting channel");
+                    odebug << "ok setting channel" << oendl; 
                     wlanconfigWiget->specifyChan->setChecked( true );
                     wlanconfigWiget->networkChannel->setValue( chan );
                 }
             }else if (action.contains("MacAddr")){
                 wlanconfigWiget->specifyAp->setChecked( true );
                 wlanconfigWiget->macEdit->setText( value );
             }else
-                qDebug("wlan plugin has no clue");
+                odebug << "wlan plugin has no clue" << oendl; 
         }
-        qDebug("next stream");
+        odebug << "next stream" << oendl; 
     }// while stream
-    qDebug("end of stream");
+    odebug << "end of stream" << oendl; 
     if (toShow) toShow->exec();
-    qDebug("returning");
+    odebug << "returning" << oendl; 
 }
 
 QWidget *WLANModule::getInfo( Interface *i)
 {
-    qDebug("WLANModule::getInfo start");
+    odebug << "WLANModule::getInfo start" << oendl; 
     WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose);
     InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i);
     info->tabWidget->insertTab(information, "TCP/IP", 0);
     info->tabWidget->setCurrentPage( 0 );
     info->tabWidget->showPage( information );
-    if (info->tabWidget->currentPage() == information ) qDebug("infotab OK");
-    else qDebug("infotab NOT OK");
-    qDebug("current idx %d", info->tabWidget->currentPageIndex());
-    qDebug("WLANModule::getInfo return");
+    if (info->tabWidget->currentPage() == information ) odebug << "infotab OK" << oendl; 
+    else odebug << "infotab NOT OK" << oendl; 
+    odebug << "current idx " << info->tabWidget->currentPageIndex() << "" << oendl; 
+    odebug << "WLANModule::getInfo return" << oendl; 
     return info;
 }