remove bogus '(const char*)' in debug statements

4 files changed, 54 insertions, 54 deletions

diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index bfdb20a..279b39c 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -237,7 +237,7 @@ void WellenreiterConfigWindow::changedStationAction(int t)
 void WellenreiterConfigWindow::getCaptureFileNameClicked()
 {
     QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true);
-    odebug << "name = " << (const char*) name << "" << oendl; 
+    odebug << "name = " << name << "" << oendl; 
     if ( !name.isEmpty() )
     {
         captureFileName->setText( name );
@@ -312,11 +312,11 @@ void WellenreiterConfigWindow::performAction( const QString& type,
     }
     else
     {
-        owarn << "WellenreiterConfigWindow::performAction(): unknown type '" << (const char*) type << "'" << oendl; 
+        owarn << "WellenreiterConfigWindow::performAction(): unknown type '" << type << "'" << oendl; 
         return;
     }
 
-    odebug << "for event '" << (const char*) type << "' I'm going to perform action " << action << " (script='" << (const char*) script << "')" << oendl; 
+    odebug << "for event '" << (const char*) type << "' I'm going to perform action " << action << " (script='" << script << "')" << oendl; 
 
     switch( action )
     {
@@ -341,7 +341,7 @@ void WellenreiterConfigWindow::performAction( const QString& type,
             script = script.replace( QRegExp( "$WEP" ), wep ? QString( "true" ) : QString( "false" ) );
             script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) );
 
-            odebug << "going to call script '" << (const char*) script << "'" << oendl; 
+            odebug << "going to call script '" << script << "'" << oendl; 
             ::system( script );
             odebug << "script returned." << oendl; 
             return;
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index a4b8839..8525109 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -252,7 +252,7 @@ void WellenreiterMainWindow::demoReadFromGps()
 {
     WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
     GPS* gps = new GPS( this );
-    odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << (const char*) configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl; 
+    odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl; 
     gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     GpsLocation loc = gps->position();
     QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) );
@@ -306,11 +306,11 @@ void WellenreiterMainWindow::fileSaveLog()
             QTextStream t( &f );
             t << mw->logWindow()->getLog();
             f.close();
-            odebug << "Saved log to file '" << (const char*) fname << "'" << oendl; 
+            odebug << "Saved log to file '" << fname << "'" << oendl; 
         }
         else
         {
-            odebug << "Problem saving log to file '" << (const char*) fname << "'" << oendl; 
+            odebug << "Problem saving log to file '" << fname << "'" << oendl; 
         }
     }
 }
@@ -327,11 +327,11 @@ void WellenreiterMainWindow::fileSaveSession()
             QDataStream t( &f );
             t << *mw->netView();
             f.close();
-            odebug << "Saved session to file '" << (const char*) fname << "'" << oendl; 
+            odebug << "Saved session to file '" << fname << "'" << oendl; 
         }
         else
         {
-            odebug << "Problem saving session to file '" << (const char*) fname << "'" << oendl; 
+            odebug << "Problem saving session to file '" << fname << "'" << oendl; 
         }
     }
 }
@@ -349,11 +349,11 @@ void WellenreiterMainWindow::fileSaveHex()
             QTextStream t( &f );
             t << mw->hexWindow()->getLog();
             f.close();
-            odebug << "Saved hex log to file '" << (const char*) fname << "'" << oendl; 
+            odebug << "Saved hex log to file '" << fname << "'" << oendl; 
         }
         else
         {
-            odebug << "Problem saving hex log to file '" << (const char*) fname << "'" << oendl; 
+            odebug << "Problem saving hex log to file '" << fname << "'" << oendl; 
         }
     }
     */
@@ -370,11 +370,11 @@ void WellenreiterMainWindow::fileLoadSession()
             QDataStream t( &f );
             t >> *mw->netView();
             f.close();
-            odebug << "Loaded session from file '" << (const char*) fname << "'" << oendl; 
+            odebug << "Loaded session from file '" << fname << "'" << oendl; 
         }
         else
         {
-            odebug << "Problem loading session from file '" << (const char*) fname << "'" << oendl; 
+            odebug << "Problem loading session from file '" << fname << "'" << oendl; 
         }
     }
 }
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index a2be782..ed9ec14 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -142,7 +142,7 @@ void MScanListView::addNewItem( const QString& type,
     while ( item && ( item->text( col_essid ) != essid ) )
     {
         #ifdef DEBUG
-        odebug << "itemtext: " << (const char*) item->text( col_essid ) << "" << oendl; 
+        odebug << "itemtext: " << item->text( col_essid ) << "" << oendl; 
         #endif
         item = static_cast<MScanListItem*> ( item->nextSibling() );
     }
@@ -158,7 +158,7 @@ void MScanListView::addNewItem( const QString& type,
         while ( item && ( item->text( col_ap ) != macaddr ) )
         {
             #ifdef DEBUG
-            odebug << "subitemtext: " << (const char*) item->text( col_ap ) << "" << oendl; 
+            odebug << "subitemtext: " << item->text( col_ap ) << "" << oendl; 
             #endif
             item = static_cast<MScanListItem*> ( item->nextSibling() );
         }
@@ -167,7 +167,7 @@ void MScanListView::addNewItem( const QString& type,
         {
             // we have already seen this item, it's a dupe
             #ifdef DEBUG
-            odebug << "" << (const char*) macaddr << " is a dupe - ignoring..." << oendl; 
+            odebug << "" << macaddr << " is a dupe - ignoring..." << oendl; 
             #endif
             item->receivedBeacon();
             return;
@@ -185,7 +185,7 @@ void MScanListView::addNewItem( const QString& type,
     // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
 
     #ifdef DEBUG
-    odebug << "inserting new station " << (const char*) macaddr << "" << oendl; 
+    odebug << "inserting new station " << macaddr << "" << oendl; 
     #endif
 
     MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
@@ -211,7 +211,7 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
     while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) )
     {
         #ifdef DEBUG
-        odebug << "subitemtext: " << (const char*) subitem->text( col_ap ) << "" << oendl; 
+        odebug << "subitemtext: " << subitem->text( col_ap ) << "" << oendl; 
         #endif
         subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
     }
@@ -220,7 +220,7 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
     {
         // we have already seen this item, it's a dupe
         #ifdef DEBUG
-        odebug << "" << (const char*) addr.toString(true) << " is a dupe - ignoring..." << oendl; 
+        odebug << "" << addr.toString(true) << " is a dupe - ignoring..." << oendl; 
         #endif
         subitem->receivedBeacon(); //FIXME: sent data bit
         return;
@@ -245,7 +245,7 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
 
 void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo )
 {
-    odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << (const char*) viaTo.toString() << " seem to form a WDS" << oendl; 
+    odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << viaTo.toString() << " seem to form a WDS" << oendl; 
     QString s;
     MScanListItem* network;
 
@@ -323,7 +323,7 @@ void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to,
 
 void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 {
-    odebug << "identify " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; 
+    odebug << "identify " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; 
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
@@ -342,7 +342,7 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 
 void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip )
 {
-    odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; 
+    odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; 
 
     //TODO: Refactor that out, we need it all over the place.
     //      Best to do it in a more comfortable abstraction in OListView
@@ -359,7 +359,7 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
             while ( subitem && ( subitem->text( col_essid ) != name ) )
             {
                 #ifdef DEBUG
-                odebug << "subitemtext: " << (const char*) subitem->text( col_essid ) << "" << oendl; 
+                odebug << "subitemtext: " << subitem->text( col_essid ) << "" << oendl; 
                 #endif
                 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
             }
@@ -368,7 +368,7 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
             {
                 // we have already seen this item, it's a dupe
                 #ifdef DEBUG
-                odebug << "" << (const char*) name << " is a dupe - ignoring..." << oendl; 
+                odebug << "" << name << " is a dupe - ignoring..." << oendl; 
                 #endif
                 subitem->receivedBeacon(); //FIXME: sent data bit
                 return;
@@ -555,7 +555,7 @@ void MScanListItem::receivedBeacon()
 {
     _beacons++;
     #ifdef DEBUG
-    odebug << "MScanListItem " << (const char*) _macaddr << ": received beacon #" << _beacons << "" << oendl; 
+    odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; 
     #endif
     setText( col_sig, QString::number( _beacons ) );
     setText( col_lastseen, QTime::currentTime().toString() );
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index fad6efd..822bde8 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -98,7 +98,7 @@ Wellenreiter::~Wellenreiter()
 
 void Wellenreiter::initialTimer()
 {
-    odebug << "Wellenreiter::preloading manufacturer database..." << oendl; 
+    odebug << "Wellenreiter::preloading manufacturer database..." << oendl;
     OManufacturerDB::instance();
 }
 
@@ -141,12 +141,12 @@ void Wellenreiter::handleNotification( OPacket* p )
         if ( configwindow->parsePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->parsePackets->protocolAction( name );
-            odebug << "parsePacket-action for '" << (const char*) name << "' seems to be '" << (const char*) action << "'" << oendl; 
+            odebug << "parsePacket-action for '" << (const char*) name << "' seems to be '" << action << "'" << oendl;
             doAction( action, name, p );
         }
         else
         {
-            odebug << "protocol '" << (const char*) name << "' not checked in parsePackets." << oendl; 
+            odebug << "protocol '" << name << "' not checked in parsePackets." << oendl;
         }
     ++it;
     }
@@ -158,7 +158,7 @@ void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket*
     if ( manage->managementType() == "Beacon" ) handleManagementFrameBeacon( p, manage );
     else if ( manage->managementType() == "ProbeRequest" ) handleManagementFrameProbeRequest( p, manage );
     else if ( manage->managementType() == "ProbeResponse" ) handleManagementFrameProbeResponse( p, manage );
-    else owarn << "Wellenreiter::handleManagementFrame(): '" << (const char*) manage->managementType() << "' - please handle me!" << oendl; 
+    else owarn << "Wellenreiter::handleManagementFrame(): '" << manage->managementType() << "' - please handle me!" << oendl;
 }
 
 
@@ -174,14 +174,14 @@ void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManage
     if ( configwindow->enableGPS->isChecked() )
     {
         // TODO: add check if GPS is working!?
-        odebug << "Wellenreiter::gathering GPS data..." << oendl; 
+        odebug << "Wellenreiter::gathering GPS data..." << oendl;
         loc = gps->position();
-        odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl; 
+        odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl;
     }
 
     if ( essid.length() )
         netView()->addNewItem( "adhoc", essid, header->macAddress2(), false /* should check FrameControl field */, -1, 0, loc, true /* only probed */ );
-    odebug << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; 
+    odebug << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl;
 }
 
 
@@ -203,7 +203,7 @@ void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPa
     }
     else
     {
-        owarn << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; 
+        owarn << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl;
         return;
     }
 
@@ -218,9 +218,9 @@ void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPa
     if ( configwindow->enableGPS->isChecked() )
     {
         // TODO: add check if GPS is working!?
-        odebug << "Wellenreiter::gathering GPS data..." << oendl; 
+        odebug << "Wellenreiter::gathering GPS data..." << oendl;
         loc = gps->position();
-        odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl; 
+        odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl;
     }
 
     netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0, loc );
@@ -247,7 +247,7 @@ void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* contro
     }
     else
     {
-        odebug << "Wellenreiter::handleControlFrame - please handle " << (const char*) control->controlType() << " in a future version! :D" << oendl; 
+        odebug << "Wellenreiter::handleControlFrame - please handle " << control->controlType() << " in a future version! :D" << oendl;
     }
 }
 
@@ -296,7 +296,7 @@ void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source,
     OARPPacket* arp = (OARPPacket*) p->child( "ARP" );
     if ( arp )
     {
-        odebug << "Received ARP traffic (type '" << (const char*) arp->type() << "'): " << oendl; 
+        odebug << "Received ARP traffic (type '" << arp->type() << "'): " << oendl;
         if ( arp->type() == "REQUEST" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
@@ -317,16 +317,16 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source,
     ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" );
     if ( dhcp )
     {
-        odebug << "Received DHCP '" << (const char*) dhcp->type() << "' packet" << oendl; 
+        odebug << "Received DHCP '" << dhcp->type() << "' packet" << oendl;
         if ( dhcp->type() == "OFFER" )
         {
-            odebug << "DHCP: '" << (const char*) source.toString() << "' ('" << (const char*) dhcp->serverAddress().toString() << "') seems to be a DHCP server." << oendl; 
+            odebug << "DHCP: '" << (const char*) source.toString() << "' ('" << dhcp->serverAddress().toString() << "') seems to be a DHCP server." << oendl;
             netView()->identify( source, dhcp->serverAddress().toString() );
             netView()->addService( "DHCP", source, dhcp->serverAddress().toString() );
         }
         else if ( dhcp->type() == "ACK" )
         {
-            odebug << "DHCP: '" << (const char*) dhcp->clientMacAddress().toString() << "' ('" << (const char*) dhcp->yourAddress().toString() << "') accepted the offered DHCP address." << oendl; 
+            odebug << "DHCP: '" << (const char*) dhcp->clientMacAddress().toString() << "' ('" << dhcp->yourAddress().toString() << "') accepted the offered DHCP address." << oendl;
             netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() );
         }
     }
@@ -360,7 +360,7 @@ bool Wellenreiter::checkDumpPacket( OPacket* p )
         if ( configwindow->capturePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->capturePackets->protocolAction( name );
-            odebug << "capturePackets-action for '" << (const char*) name << "' seems to be '" << (const char*) action << "'" << oendl; 
+            odebug << "capturePackets-action for '" << (const char*) name << "' seems to be '" << action << "'" << oendl;
             if ( action == "Discard" )
             {
                 logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) );
@@ -369,7 +369,7 @@ bool Wellenreiter::checkDumpPacket( OPacket* p )
         }
         else
         {
-            odebug << "protocol '" << (const char*) name << "' not checked in capturePackets." << oendl; 
+            odebug << "protocol '" << name << "' not checked in capturePackets." << oendl;
         }
     ++it;
     }
@@ -513,14 +513,14 @@ void Wellenreiter::startClicked()
 
     if ( cardtype != DEVTYPE_FILE )
     {
-    
+
         if ( !net->isPresent( interface ) )
         {
             QMessageBox::information( this, "Wellenreiter II",
                                     tr( "The configured device (%1)\nis not available on this system\n. Please reconfigure!" ).arg( interface ) );
             return;
         }
-    
+
         iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless!
         assert( iface );
 
@@ -543,7 +543,7 @@ void Wellenreiter::startClicked()
         case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
-        case DEVTYPE_FILE: odebug << "Wellenreiter: Capturing from file '" << (const char*) interface << "'" << oendl;  break;
+        case DEVTYPE_FILE: odebug << "Wellenreiter: Capturing from file '" << interface << "'" << oendl;  break;
         default: assert( 0 ); // shouldn't reach this
     }
 
@@ -564,7 +564,7 @@ void Wellenreiter::startClicked()
     // open GPS device
     if ( configwindow->enableGPS->isChecked() )
     {
-        odebug << "Wellenreiter:GPS enabled @ " << (const char*) configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "" << oendl; 
+        odebug << "Wellenreiter:GPS enabled @ " << configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "" << oendl;
         gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     }
 
@@ -588,7 +588,7 @@ void Wellenreiter::startClicked()
     else
         pcap->open( QFile( interface ) );
 
-    odebug << "Wellenreiter:: dumping to " << (const char*) dumpname << "" << oendl; 
+    odebug << "Wellenreiter:: dumping to " << dumpname << "" << oendl;
     pcap->openDumpFile( dumpname );
 
     if ( !pcap->isOpen() )
@@ -638,13 +638,13 @@ void Wellenreiter::startClicked()
     {
         assert( parent() );
         ( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) );
-    }   
+    }
 }
 
 
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
-    odebug << "Wellenreiter::timerEvent()" << oendl; 
+    odebug << "Wellenreiter::timerEvent()" << oendl;
     OPacket* p = pcap->next();
     if ( !p ) // no more packets available
     {
@@ -707,15 +707,15 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
 
     QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" );
     int count = 3;
-    odebug << "sending " << count << " messages" << oendl; 
+    odebug << "sending " << count << " messages" << oendl;
     msg << QString("count") << QString::number(count);
-    odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl; 
+    odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl;
     msg << QString(iface->name()) << QString("Mode") << type;
-    odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl; 
+    odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl;
     msg << QString(iface->name()) << QString("ESSID") << essid;
-    odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl; 
+    odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl;
     msg << QString(iface->name()) << QString("Channel") << channel;
-//    odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl; 
+//    odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl;
 //    msg << QString(iface->name()) << QString("MacAddr") << macaddr;
     #else
     QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) );