-rw-r--r-- | noncore/applets/zkbapplet/zkbwidget.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/keyz-cfg/zkb.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/keyz-cfg/zkbcfg.cpp | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 18 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 24 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 26 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp2.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 2 |
9 files changed, 45 insertions, 45 deletions
diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/zkbwidget.cpp index 13d554c..38bfba9 100644 --- a/noncore/applets/zkbapplet/zkbwidget.cpp +++ b/noncore/applets/zkbapplet/zkbwidget.cpp @@ -95,5 +95,5 @@ QSize ZkbWidget::sizeHint() const { void ZkbWidget::stateChanged(const QString& s) { -// odebug << "stateChanged: " << (const char*) s.utf8() << "\n" << oendl; +// odebug << "stateChanged: " << s.utf8() << "\n" << oendl; setText(s); } diff --git a/noncore/apps/keyz-cfg/zkb.cpp b/noncore/apps/keyz-cfg/zkb.cpp index 8382615..58bde2a 100644 --- a/noncore/apps/keyz-cfg/zkb.cpp +++ b/noncore/apps/keyz-cfg/zkb.cpp @@ -365,5 +365,5 @@ State* Keymap::getStateByLabel(const QString& label) { } -// odebug << "look for: " << (const char*) name.utf8() << "\n" << oendl; +// odebug << "look for: " << name.utf8() << "\n" << oendl; QMap<QString, State*>::Iterator sit = states.find(name); if (sit != states.end()) { diff --git a/noncore/apps/keyz-cfg/zkbcfg.cpp b/noncore/apps/keyz-cfg/zkbcfg.cpp index f1d53ba..24bd897 100644 --- a/noncore/apps/keyz-cfg/zkbcfg.cpp +++ b/noncore/apps/keyz-cfg/zkbcfg.cpp @@ -20,5 +20,5 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix) QFileInfo fi(f); - odebug << "start loading file=" << (const char*) file.utf8() << "\n" << oendl; + odebug << "start loading file=" << file.utf8() << "\n" << oendl; if (includedFiles.find(fi.absFilePath()) != includedFiles.end()) { return false; @@ -126,5 +126,5 @@ bool ZkbHandler::startStateElement(const QString& name, currentState = keymap.getStateByName(currentStateName); -// odebug << "state name=" << (const char*) currentStateName.utf8() << "\n" << oendl; +// odebug << "state name=" << currentStateName.utf8() << "\n" << oendl; State* parent = 0; 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 @@ -238,5 +238,5 @@ void WellenreiterConfigWindow::getCaptureFileNameClicked() { QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true); - odebug << "name = " << (const char*) name << "" << oendl; + odebug << "name = " << name << "" << oendl; if ( !name.isEmpty() ) { @@ -313,9 +313,9 @@ 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 ) @@ -342,5 +342,5 @@ void WellenreiterConfigWindow::performAction( const QString& type, 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; 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 @@ -253,5 +253,5 @@ 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(); @@ -307,9 +307,9 @@ void WellenreiterMainWindow::fileSaveLog() 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; } } @@ -328,9 +328,9 @@ void WellenreiterMainWindow::fileSaveSession() 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; } } @@ -350,9 +350,9 @@ void WellenreiterMainWindow::fileSaveHex() 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; } } @@ -371,9 +371,9 @@ void WellenreiterMainWindow::fileLoadSession() 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 @@ -143,5 +143,5 @@ void MScanListView::addNewItem( const QString& type, { #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() ); @@ -159,5 +159,5 @@ void MScanListView::addNewItem( const QString& type, { #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() ); @@ -168,5 +168,5 @@ 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(); @@ -186,5 +186,5 @@ void MScanListView::addNewItem( const QString& type, #ifdef DEBUG - odebug << "inserting new station " << (const char*) macaddr << "" << oendl; + odebug << "inserting new station " << macaddr << "" << oendl; #endif @@ -212,5 +212,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& { #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() ); @@ -221,5 +221,5 @@ 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 @@ -246,5 +246,5 @@ 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; @@ -324,5 +324,5 @@ 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 ); @@ -343,5 +343,5 @@ 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. @@ -360,5 +360,5 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr, { #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() ); @@ -369,5 +369,5 @@ 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 @@ -556,5 +556,5 @@ 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 ) ); 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 @@ -142,10 +142,10 @@ void Wellenreiter::handleNotification( OPacket* p ) { 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; @@ -159,5 +159,5 @@ void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* 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; } @@ -248,5 +248,5 @@ 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; } } @@ -297,5 +297,5 @@ void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, if ( arp ) { - odebug << "Received ARP traffic (type '" << (const char*) arp->type() << "'): " << oendl; + odebug << "Received ARP traffic (type '" << arp->type() << "'): " << oendl; if ( arp->type() == "REQUEST" ) { @@ -318,8 +318,8 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, 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() ); @@ -327,5 +327,5 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, 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() ); } @@ -361,5 +361,5 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) { 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" ) { @@ -370,5 +370,5 @@ 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; @@ -544,5 +544,5 @@ void Wellenreiter::startClicked() 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 } @@ -565,5 +565,5 @@ void Wellenreiter::startClicked() 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() ); } @@ -589,5 +589,5 @@ void Wellenreiter::startClicked() pcap->open( QFile( interface ) ); - odebug << "Wellenreiter:: dumping to " << (const char*) dumpname << "" << oendl; + odebug << "Wellenreiter:: dumping to " << dumpname << "" << oendl; pcap->openDumpFile( dumpname ); diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp index e483efe..e4aa2f9 100644 --- a/noncore/settings/networksettings/wlan/wlanimp2.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp @@ -308,5 +308,5 @@ void WLANImp::rescanNeighbourhood() { QString name = interface->getInterfaceName(); - odebug << "rescanNeighbourhood via '" << (const char*) name << "'" << oendl; + odebug << "rescanNeighbourhood via '" << name << "'" << oendl; OWirelessNetworkInterface* wiface = static_cast<OWirelessNetworkInterface*>( ONetwork::instance()->interface( name ) ); @@ -336,5 +336,5 @@ void WLANImp::rescanNeighbourhood() else { - odebug << "rescanNeighbourhood(): device type seems to be '" << (const char*) devicetype << "'" << oendl; + odebug << "rescanNeighbourhood(): device type seems to be '" << devicetype << "'" << oendl; } diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index 4163fb2..53d4897 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp @@ -149,5 +149,5 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) { QString machline = ts.readLine(); - odebug << "sysinfo: parsing benchmark results for '" << (const char*) machline << "'" << oendl; + odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl; QString resline = ts.readLine(); machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) ); |