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

9 files changed, 61 insertions, 61 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
@@ -65,65 +65,65 @@ bool ZkbWidget::loadKeymap() {
 	setText(keymap->getCurrentLabel());
 
 	labels->clear();
 	QStringList l = keymap->listLabels();
 	labels->insertItem(disabled, 0, 0);
 	int n = 1;
 	w = 0;
 	for(QStringList::Iterator it = l.begin(); it != l.end();
 		++it, n++) {
 
 //		printf("label: %s\n", (const char*) (*it).utf8());
 
 		labels->insertItem(*it, n, n);
 		int lw = fm.width(*it);
 		if (lw > w) {
 			w = lw;
 		}
 	}
 
 	if (w == 0) {
 		hide();
 	} else {
 		show();
 	}
 	return true;
 }
 
 QSize ZkbWidget::sizeHint() const {
     return QSize(AppLnk::smallIconSize(),AppLnk::smallIconSize());
 }
 
 void ZkbWidget::stateChanged(const QString& s) {
-//	odebug << "stateChanged: " << (const char*) s.utf8() << "\n" << oendl; 
+//	odebug << "stateChanged: " << s.utf8() << "\n" << oendl; 
 	setText(s);
 }
 
 void ZkbWidget::labelChanged(int id) {
 	if (id == 0) {
 		keymap->disable();
 		setPixmap(disabled);
 		return;
 	}
 
 	keymap->enable();
 
 	QStringList l = keymap->listLabels();
 	QString lbl = l[id-1];
 
 //	printf("labelChanged: %s\n", (const char*) lbl.utf8());
 	State* state = keymap->getStateByLabel(lbl);
 	if (state != 0) {
 		keymap->setCurrentState(state);
 		setText(lbl);
 	}
 }
 
 void ZkbWidget::mouseReleaseEvent(QMouseEvent*) {
 	QSize sh = labels->sizeHint();
 	QPoint p = mapToGlobal(QPoint((width()-sh.width())/2,-sh.height()));
 	labels->exec(p);
 }
 
 void ZkbWidget::signalReceived(const QCString& msg, const QByteArray& data) {
 	QDataStream stream(data, IO_ReadOnly);
 
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
@@ -335,65 +335,65 @@ State* Keymap::getStateByName(const QString& name) {
 }
 
 QStringList Keymap::listLabels() {
 	QStringList ret;
 
 	for(uint i = 0; i < labelList.count(); i++) {
 		ret.append(*labelList.at(i));
 	}
 
 	return ret;
 }
 
 State* Keymap::getStateByLabel(const QString& label) {
 	QMap<QString, QString>::Iterator lit = labels.find(label);
 	State* state = 0;
 
 	if (lit == labels.end()) {
 		return 0;
 	}
 
 	QString name = lit.data();
 
 	int n = name.find(":*");
 	if (n>=0 && n==(int)(name.length()-2)) {
 		name=name.left(name.length() - 1);
 
 		n = currentStateName.findRev(":");
 		if (n >= 0) {
 			name += currentStateName.mid(n+1);
 		}
 	}
 
-//	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()) {
 		state = sit.data();
 	}
 
 	return state;
 }
 
 bool Keymap::addState(const QString& name, State* state) {
 	if (states.find(name) != states.end()) {
 		return false;
 	}
 
 	states.insert(name, state);
 	lsmapInSync = false;
 
 	if (currentState == 0) {
 		setCurrentState(state);
 	}
 
 	return true;
 }
 
 State* Keymap::getCurrentState() const {
 	return currentState;
 }
 
 QString Keymap::getCurrentLabel() {
 	return currentLabel;
 }
 
 bool Keymap::setCurrentState(State* state) {
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
@@ -1,54 +1,54 @@
 #include "zkbcfg.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qfileinfo.h>
 
 // Implementation of XkbConfig class
 ZkbConfig::ZkbConfig(const QString& dir):path(dir) {
 }
 
 ZkbConfig::~ZkbConfig() {
 }
 
 bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix) {
 	bool ret;
 	QFile f(path+"/"+file);
 	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;
 	}
 
 	includedFiles.insert(fi.absFilePath(), 1);
 	QXmlInputSource is(f);
 	QXmlSimpleReader reader;
 	ZkbHandler h(*this, keymap, prefix);
 
 	reader.setContentHandler(&h);
 	reader.setErrorHandler(this);
 	ret = reader.parse(is);
 	includedFiles.remove(fi.absFilePath());
 
 	odebug << "end loading file=" << file.utf8() << ": status=" << err.utf8() << oendl;
 	return ret;
 }
 
 bool ZkbConfig::warning(const QXmlParseException& e) {
 	QString tmp;
 
 	tmp.sprintf("%d: warning: %s\n", e.lineNumber(), 
 		(const char*) e.message().utf8());
 
 	err += tmp;
 
 	return true;
 }
 
 bool ZkbConfig::error(const QXmlParseException& e) {
 	QString tmp;
 
@@ -96,65 +96,65 @@ bool ZkbHandler::startIncludeElement(const QString& file,
 	QString p = prefix;
 
 	if (!pref.isNull()) {
 		p += pref + ":";
 	}
 		
 
 	bool ret = zkc.load(file, keymap, p);
 	if (!ret) {
 		setError("Error including file: " + file);
 	}
 
 	return ret;
 }
 
 bool ZkbHandler::startLabelElement(const QString& label, 
 	const QString& state) {
 
 	if (!keymap.addLabel(label, prefix + state)) {
 		err = "label " + label + " already defined";
 		return false;
 	}
 
 	return true;
 }
 
 bool ZkbHandler::startStateElement(const QString& name, 
 	const QString& parentName, bool dflt) {
 
 	currentStateName = prefix + name;
 	currentState = keymap.getStateByName(currentStateName);
 
-//	odebug << "state name=" << (const char*) currentStateName.utf8() << "\n" << oendl; 
+//	odebug << "state name=" << currentStateName.utf8() << "\n" << oendl; 
 
 	State* parent = 0;
 	if (!parentName.isEmpty()) {
 		QString pn = prefix + parentName;
 		parent = keymap.getStateByName(pn);
 		if (parent == 0) {
 			err = currentStateName + 
 				": undefined parent state: " + pn;
 			return false;
 		}
 	}
 
 	if (currentState == 0) {
 		currentState = new State(parent);
 		keymap.addState(currentStateName, currentState);
 	} else {
 		if (parent!=0) {
 			currentState->setParent(parent);
 		}
 	}
 
 	if (dflt) {
 		keymap.setCurrentState(currentState);
 	}
 
 	return true;
 }
 
 bool ZkbHandler::startMapElement(int keycode, bool pressed) {
 	currentAction = currentState->get(keycode, pressed);
 	if (currentAction == 0) {
 		setError("keycode " + QString::number(keycode) + " not supported");
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
@@ -208,65 +208,65 @@ void WellenreiterConfigWindow::synchronizeActionsAndScripts()
 {
     if ( newNetworkAction->currentItem() == 4 ) newNetworkScript->show(); else newNetworkScript->hide();
     if ( newClientAction->currentItem() == 4 ) newClientScript->show(); else newClientScript->hide();
     if ( newStationAction->currentItem() == 4 ) newStationScript->show(); else newStationScript->hide();
 
     //newNetworkScript->setEnabled( newNetworkAction->currentItem() == 4 );
     //newClientScript->setEnabled( newClientAction->currentItem() == 4 );
     //newStationScript->setEnabled( newStationAction->currentItem() == 4 );
 }
 
 
 void WellenreiterConfigWindow::changedNetworkAction(int t)
 {
     synchronizeActionsAndScripts();
 }
 
 
 void WellenreiterConfigWindow::changedClientAction(int t)
 {
     synchronizeActionsAndScripts();
 }
 
 
 void WellenreiterConfigWindow::changedStationAction(int t)
 {
     synchronizeActionsAndScripts();
 }
 
 
 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 );
     }
 }
 
 
 void WellenreiterConfigWindow::channelAllClicked(int state)
 {
     bool b = state;
     channel1->setChecked( b );
     channel2->setChecked( b );
     channel3->setChecked( b );
     channel4->setChecked( b );
     channel5->setChecked( b );
     channel6->setChecked( b );
     channel7->setChecked( b );
     channel8->setChecked( b );
     channel9->setChecked( b );
     channel10->setChecked( b );
     channel11->setChecked( b );
     channel12->setChecked( b );
     channel13->setChecked( b );
     channel14->setChecked( b );
 }
 
 
 bool WellenreiterConfigWindow::useGPS() const
 {
     return enableGPS->isChecked();
 }
 
@@ -283,94 +283,94 @@ int WellenreiterConfigWindow::gpsPort() const
     return useGPS() ? gpsdPort->value() : -1;
 }
 
 
 void WellenreiterConfigWindow::performAction( const QString& type,
                                               const QString& essid,
                                               const QString& mac,
                                               bool wep,
                                               int channel,
                                               int signal
                                               /* , const GpsLocation& loc */ )
 {
     int action;
     QString script;
 
     if ( type == "network" )
     {
         action = newNetworkAction->currentItem();
         script = newNetworkScript->text();
     }
     else if ( type == "managed" || type == "adhoc" )
     {
         action = newClientAction->currentItem();
         script = newClientScript->text();
     }
     else if ( type == "station" )
     {
         action = newStationAction->currentItem();
         script = newStationScript->text();
     }
     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 )
     {
         case 0: /* Ignore */ return;
         case 1: /* Play Alarm */ ODevice::inst()->playAlarmSound(); return;
         case 2: /* Play Click */ ODevice::inst()->playTouchSound(); return;
         case 3: /* Blink LED */ break; //FIXME: Implement this
         case 4: /* Run Script */
         {
             /**
                 *
                 * Script Substitution Information:
                 *
                 * $SSID = SSID
                 * $MAC = MAC
                 * $WEP = Wep
                 * $CHAN = Channel
                 *
                 **/
             script = script.replace( QRegExp( "$SSID" ), essid );
             script = script.replace( QRegExp( "$MAC" ), mac );
             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;
         }
         default: assert( false );
     }
 }
 
 
 void WellenreiterConfigWindow::load()
 {
 #ifdef Q_WS_X11
     #warning Persistent Configuration not yet implemented for standalone X11 build
     performAutodetection();
 #else
     odebug << "loading configuration settings..." << oendl; 
 
     /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
 
     OConfig* c = oApp->config();
 
     c->setGroup( "Interface" );
 
     QString interface = c->readEntry( "name", "<none>" );
     if ( interface != "<none>" )
     {
 #if QT_VERSION < 300
         interfaceName->insertItem( interface, 0 );
         interfaceName->setCurrentItem( 0 );
 #else
         interfaceName->setCurrentText( interface );
 #endif
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
@@ -223,187 +223,187 @@ void WellenreiterMainWindow::changedSniffingState()
     menuBar()->setItemEnabled( stopID, mw->sniffing );
 
     if ( !mw->sniffing )
     {
         menuBar()->setItemEnabled( uploadID, true );
         uploadButton->setEnabled( true );
     }
 }
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
     odebug << "Wellenreiter: bye." << oendl; 
 };
 
 
 void WellenreiterMainWindow::demoAddStations()
 {
     //mw = 0; // test SIGSEGV handling
 
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 39.8794, -94.0936) );
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:03:F8:E7:16:22"), false, 3, 10, GpsLocation( 5.5, 2.3 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:04:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:05:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.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();
     QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) );
     delete gps;
 }
 
 
 QString WellenreiterMainWindow::getFileName( bool save )
 {
     QMap<QString, QStringList> map;
     map.insert( tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert( tr("Text"), text );
     text << "*";
     map.insert( tr("All"), text );
 
     QString str;
     if ( save )
     {
         #ifdef QWS
         str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getSaveFileName();
         #endif
         if ( str.isEmpty() /*|| QFileInfo(str).isDir()*/ )
             return "";
     }
     else
     {
         #ifdef QWS
         str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getOpenFileName();
         #endif
         if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )
             return "";
     }
     return str;
 }
 
 
 void WellenreiterMainWindow::fileSaveLog()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             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; 
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveSession()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
 
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             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; 
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveHex()
 {
     #warning DOES NOT WORK AT THE MOMENT
     /*
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             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; 
         }
     }
     */
 }
 
 void WellenreiterMainWindow::fileLoadSession()
 {
     QString fname = getFileName( false );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_ReadOnly) )
         {
             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; 
         }
     }
 }
 
 
 void WellenreiterMainWindow::fileNew()
 {
     mw->netView()->clear();
     mw->logWindow()->clear();
     mw->hexWindow()->clear();
 }
 
 
 void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
 {
     if ( mw->isDaemonRunning() )
     {
         QMessageBox::warning( this, "Wellenreiter/Opie",
                               tr( "Sniffing in progress!\nPlease stop sniffing before closing." ) );
         e->ignore();
     }
     else
     {
         QMainWindow::closeEvent( e );
     }
 }
 
 static const char* CAP_hostname = "www.vanille.de";
 
 #include <netdb.h>
 #include <unistd.h>
 #include <sys/types.h>
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
@@ -113,168 +113,168 @@ void MScanListView::serializeTo( QDataStream& s) const
 void MScanListView::serializeFrom( QDataStream& s)
 {
     odebug << "serializing MScanListView" << oendl; 
     OListView::serializeFrom( s );
 }
 
 
 void MScanListView::addNewItem( const QString& type,
                                 const QString& essid,
                                 const OMacAddress& mac,
                                 bool wep,
                                 int channel,
                                 int signal,
                                 const GpsLocation& loc,
                                 bool probe )
 {
     QString macaddr = mac.toString(true);
 
     #ifdef DEBUG
     qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", (const char*) type,
             (const char*) essid, (const char*) macaddr, channel );
     #endif
 
     // search, if we already have seen this net
 
     QString s;
     MScanListItem* network;
     MScanListItem* item = static_cast<MScanListItem*> ( firstChild() );
 
     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() );
     }
     if ( item )
     {
         // we have already seen this net, check all childs if MAC exists
 
         network = item;
 
         item = static_cast<MScanListItem*> ( item->firstChild() );
         assert( item ); // this shouldn't fail
 
         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() );
         }
 
         if ( item )
         {
             // 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;
         }
     }
     else
     {
         s.sprintf( "(i) New network: ESSID '%s'", (const char*) essid );
         MLogWindow::logwindow()->log( s );
         network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0, probe );
     }
 
 
     // insert new station as child from network
     // 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 );
     station->setManufacturer( mac.manufacturer() );
     station->setLocation( loc.dmsPosition() );
 
     if ( type == "managed" )
     {
         s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel );
     }
     else
     {
         s.sprintf( "(i) New AdHoc station in '%s' [%d]", (const char*) essid, channel );
     }
     MLogWindow::logwindow()->log( s );
 }
 
 
 void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& addr, const QString& type )
 {
     MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
 
     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() );
     }
 
     if ( subitem )
     {
         // 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;
     }
 
     // Hey, it seems to be a new item :-D
     MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr.toString(true), false, -1, -1 );
     station->setManufacturer( addr.manufacturer() );
 
     QString s;
     if ( type == "station" )
     {
         s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) );
     }
     else
     {
         s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) );
     }
     MLogWindow::logwindow()->log( s );
 }
 
 
 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;
 
     QListViewItemIterator it( this );
     while ( it.current() &&
             it.current()->text( col_ap ) != viaFrom.toString(true) &&
             it.current()->text( col_ap ) != viaTo.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from );
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to );
     }
     else
     {
         odebug << "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" << oendl; 
         MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" );
     }
 }
 
 
 void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
@@ -294,110 +294,110 @@ void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to,
 
 void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" );
     }
     else
     {
         odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; 
         MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
     }
 }
 
 
 void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     owarn << "D'oh! Not yet implemented..." << oendl; 
     MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
 }
 
 
 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 )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
             it.current()->setText( col_ip, ip );
             return;
         }
     }
     odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; 
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!",
                                                      (const char*) macaddr.toString(), (const char*) 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
     //      (Hmm, didn't I already start something in this direction?)
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
 
             MScanListItem* subitem = static_cast<MScanListItem*>( it.current()->firstChild() );
 
             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() );
             }
 
             if ( subitem )
             {
                 // 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;
             }
 
             // never seen that - add new item
 
             MScanListItem* item = new MScanListItem( it.current(), "service", "N/A", " ", false, -1, -1 );
             item->setText( col_essid, name );
 
             return;
         }
     }
     odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; 
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled service addition %s = %s!",
                                                      (const char*) macaddr.toString(), (const char*) ip ) );
 }
 
 
 void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col )
 {
     if ( !item ) return;
 
     MScanListItem* itm = static_cast<MScanListItem*>( item );
 
     qDebug( "contextMenuRequested on item '%s' (%s) in column: '%d'",
             (const char*) itm->text(0), (const char*) itm->type, col );
 
     if ( itm->type == "adhoc" || itm->type == "managed" )
     {
         QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() );
 
@@ -526,42 +526,42 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
     this->type = type;
     _type = type;
     _essid = essid;
     _macaddr = macaddr;
     _channel = channel;
     _beacons = 1;
     _signal = 0;
 
     if ( WellenreiterConfigWindow::instance()->openTree->isChecked() )
     {
         listView()->ensureItemVisible( this );
     }
 
 }
 
 
 void MScanListItem::setManufacturer( const QString& manufacturer )
 {
     setText( col_manuf, manufacturer );
 }
 
 
 void MScanListItem::setLocation( const QString& location )
 {
     setText( col_location, location );
 }
 
 
 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() );
 
     MScanListItem* p = (MScanListItem*) parent();
     if ( p ) p->receivedBeacon();
 
 }
 
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
@@ -69,336 +69,336 @@ Wellenreiter::Wellenreiter( QWidget* parent )
     //
     // detect operating system
     //
 
     #ifdef QWS
     QString sys;
     sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() );
     _system = ODevice::inst()->system();
     logwindow->log( sys );
     #endif
 
     netview->setColumnWidthMode( 1, QListView::Manual );
     connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ),
              this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) );
     pcap = new OPacketCapturer();
     pcap->setAutoDelete( false );
 
     gps = new GPS( this );
 
     QTimer::singleShot( 1000, this, SLOT( initialTimer() ) );
 
 }
 
 
 Wellenreiter::~Wellenreiter()
 {
     delete pcap;
 }
 
 
 void Wellenreiter::initialTimer()
 {
-    odebug << "Wellenreiter::preloading manufacturer database..." << oendl; 
+    odebug << "Wellenreiter::preloading manufacturer database..." << oendl;
     OManufacturerDB::instance();
 }
 
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 
 void Wellenreiter::channelHopped(int c)
 {
     QString title = "Wellenreiter II -scan- [";
     QString left;
     if ( c > 1 ) left.fill( '.', c-1 );
     title.append( left );
     title.append( '|' );
     if ( c < iface->channels() )
     {
         QString right;
         right.fill( '.', iface->channels()-c );
         title.append( right );
     }
     title.append( "]" );
     //title.append( QString().sprintf( " %02d", c ) );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( title );
 }
 
 
 void Wellenreiter::handleNotification( OPacket* p )
 {
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         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;
     }
 }
 
 
 void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* manage )
 {
     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;
 }
 
 
 void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* request )
 {
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
     int channel = ds ? ds->channel() : -1;
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     GpsLocation loc( -111, -111 );
     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;
 }
 
 
 void Wellenreiter::handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* response )
 {
 }
 
 
 void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* beacon )
 {
     QString type;
     if ( beacon->canIBSS() )
     {
         type = "adhoc";
     }
     else if ( beacon->canESS() )
     {
         type = "managed";
     }
     else
     {
-        owarn << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; 
+        owarn << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl;
         return;
     }
 
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
     int channel = ds ? ds->channel() : -1;
 
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     GpsLocation loc( -111, -111 );
     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 );
 
     // update graph window
     if ( ds )
     {
         OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
         if ( prism )
             graphwindow->traffic( ds->channel(), prism->signalStrength() );
         else
             graphwindow->traffic( ds->channel(), 95 );
     }
 }
 
 
 void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* control )
 {
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     if ( control->controlType() == "Acknowledge" )
     {
         netView()->addNewItem( "adhoc", "<unknown>", header->macAddress1(), false, -1, 0, GpsLocation( -111, -111 ) );
     }
     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;
     }
 }
 
 
 void Wellenreiter::handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to )
 {
     OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
     if ( wlan->fromDS() && !wlan->toDS() )
     {
         netView()->fromDStraffic( wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
         from = wlan->macAddress3();
         to = wlan->macAddress2();
     }
     else if ( !wlan->fromDS() && wlan->toDS() )
     {
         netView()->toDStraffic( wlan->macAddress2(), wlan->macAddress3(), wlan->macAddress1() );
         from = wlan->macAddress2();
         to = wlan->macAddress3();
     }
     else if ( wlan->fromDS() && wlan->toDS() )
     {
         netView()->WDStraffic( wlan->macAddress4(), wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
         from = wlan->macAddress4();
         to = wlan->macAddress3();
     }
     else
     {
         netView()->IBSStraffic( wlan->macAddress2(), wlan->macAddress1(), wlan->macAddress3() );
         from = wlan->macAddress2();
         to = wlan->macAddress1();
     }
 }
 
 
 void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to )
 {
     from = data->sourceAddress();
     to = data->destinationAddress();
 
     netView()->addNewItem( "station", "<wired>", from, false, -1, 0, GpsLocation( -111, -111 ) );
 }
 
 
 void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, OMacAddress& dest )
 {
     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() );
         }
         else if ( arp->type() == "REPLY" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
             netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() );
         }
     }
 }
 
 
 void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, OMacAddress& dest )
 {
     //TODO: Implement more IP based protocols
 
     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() );
         }
     }
 }
 
 
 QObject* Wellenreiter::childIfToParse( OPacket* p, const QString& protocol )
 {
     if ( configwindow->parsePackets->isProtocolChecked( protocol ) )
         if ( configwindow->parsePackets->protocolAction( protocol ) == "Discard!" )
             return 0;
 
     return p->child( protocol );
 }
 
 
 bool Wellenreiter::checkDumpPacket( OPacket* p )
 {
     // go through all child packets and see if one is inside the child hierarchy for p
     // if so, do what the user requested (protocolAction), e.g. pass or discard
     if ( !configwindow->writeCaptureFile->isChecked() )
         return true; // semantic change - we're logging anyway now to /tmp/wellenreiter
 
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         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 ) );
                 return false;
             }
         }
         else
         {
-            odebug << "protocol '" << (const char*) name << "' not checked in capturePackets." << oendl; 
+            odebug << "protocol '" << name << "' not checked in capturePackets." << oendl;
         }
     ++it;
     }
     return true;
 }
 
 
 void Wellenreiter::receivePacket( OPacket* p )
 {
     hexWindow()->add( p );
 
     if ( checkDumpPacket( p ) )
     {
         pcap->dump( p );
     }
 
     // check for a management frame
     OWaveLanManagementPacket* manage = static_cast<OWaveLanManagementPacket*>( childIfToParse( p, "802.11 Management" ) );
     if ( manage )
     {
         handleManagementFrame( p, manage );
         return;
     }
 
     // check for a control frame
     OWaveLanControlPacket* control = static_cast<OWaveLanControlPacket*>( childIfToParse( p, "802.11 Control" ) );
     if ( control )
     {
         handleControlFrame( p, control );
         return;
     }
 
@@ -484,242 +484,242 @@ void Wellenreiter::stopClicked()
     #else
         #warning FIXME: setScreenSaverMode is not operational on the X11 build
     #endif
 
     // print out statistics
     for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it )
        statwindow->updateCounter( it.key(), it.data() );
 }
 
 
 void Wellenreiter::startClicked()
 {
     // get configuration from config window
 
     const QString& interface = configwindow->interfaceName->currentText();
     const int cardtype = configwindow->driverType();
     const int interval = configwindow->hoppingInterval();
 
     if ( ( interface == "" ) || ( cardtype == 0 ) )
     {
         QMessageBox::information( this, "Wellenreiter II",
                                   tr( "Your device is not\nproperly configured. Please reconfigure!" ) );
         return;
     }
 
     // configure device
     ONetwork* net = ONetwork::instance();
 
     // TODO: check if interface is wireless and support sniffing for non-wireless interfaces
 
     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 );
 
         // bring device UP
         iface->setUp( true );
         if ( !iface->isUp() )
         {
             QMessageBox::warning( this, "Wellenreiter II",
                                 tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) );
             return;
         }
     }
     // set monitor mode
     bool usePrism = configwindow->usePrismHeader();
 
     switch ( cardtype )
     {
         case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break;
         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
     }
 
     // switch device into monitor mode
     if ( cardtype < DEVTYPE_FILE )
     {
         if ( cardtype != DEVTYPE_MANUAL )
             iface->setMode( "monitor" );
         if ( iface->mode() != "monitor" )
         {
             if ( QMessageBox::warning( this, "Wellenreiter II",
                                   tr( "Can't set interface '%1'\ninto monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) +
                                   tr( "\nContinue with limited functionality?" ), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
                 return;
         }
     }
 
     // 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() );
     }
 
     // open pcap and start sniffing
 
     if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file?
     {
         dumpname = configwindow->captureFileName->text();
         if ( dumpname.isEmpty() ) dumpname = "captureFile";
         dumpname.append( '-' );
         dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
         dumpname.append( ".wellenreiter" );
     }
     else // write it anyway ;)
     {
         dumpname = "/var/log/dump.wellenreiter";
     }
 
     if ( cardtype != DEVTYPE_FILE )
         pcap->open( interface );
     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() )
     {
         QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg(
                               cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) ));
         return;
     }
 
     // set capturer to non-blocking mode
     pcap->setBlocking( false );
 
     // start channel hopper
     if ( cardtype != DEVTYPE_FILE )
     {
         logwindow->log( QString().sprintf( "(i) Starting channel hopper (d=%d ms)", configwindow->hopInterval->value() ) );
         iface->setChannelHopping( configwindow->hopInterval->value() ); //use interval from config window
     }
 
     if ( cardtype != DEVTYPE_FILE )
     {
         // connect socket notifier and start channel hopper
         connect( pcap, SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) );
         connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
     }
     else
     {
         // start timer for reading packets
         startTimer( 100 );
     }
 
     logwindow->log( "(i) Started Scanning." );
     sniffing = true;
 
     #ifdef QWS
     if ( WellenreiterConfigWindow::instance()->disablePM->isChecked() )
     {
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Disable;
     }
     #else
         #warning FIXME: setScreenSaverMode is not operational on the X11 build
     #endif
 
     emit( startedSniffing() );
     if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
     else
     {
         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
     {
         stopClicked();
     }
     else
     {
         receivePacket( p );
         // We no longer delete packets here. Ownership of the packets is
         // transferred to the PacketView.
         //delete p;
     }
 }
 
 
 void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p )
 {
     #ifdef QWS
     if ( action == "TouchSound" )
         ODevice::inst()->playTouchSound();
     else if ( action == "AlarmSound" )
         ODevice::inst()->playAlarmSound();
     else if ( action == "KeySound" )
         ODevice::inst()->playKeySound();
     else if ( action == "LedOn" )
         ODevice::inst()->setLedState( Led_Mail, Led_On );
     else if ( action == "LedOff" )
         ODevice::inst()->setLedState( Led_Mail, Led_Off );
     else if ( action == "LogMessage" )
         logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     else if ( action == "MessageBox" )
         QMessageBox::information( this, "Notification!",
         QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     #else
     #warning Actions do not work with Qt/X11 yet
     #endif
 }
 
 void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr)
 {
     #ifdef QWS
     if ( !iface )
     {
         QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) );
         return;
     }
 
     if ( sniffing )
     {
         QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Stop sniffing before\njoining a net." ) );
         return;
     }
 
     qDebug( "joinNetwork() with Interface %s: %s, %s, %d, %s",
         (const char*) iface->name(),
         (const char*) type,
         (const char*) essid,
         channel,
         (const char*) macaddr );
 
     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" ) );
     #endif
 
 }
 
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
@@ -278,93 +278,93 @@ void WLANImp::writeOpts() {
     }
 
     keyList += "key";
     if (keyRadio0->isChecked()) {
       keyList += "[1]";
     } else if (keyRadio1->isChecked()) {
       keyList += "[2]";
     } else if (keyRadio2->isChecked()) {
       keyList += "[3]";
     } else if (keyRadio3->isChecked()) {
       keyList += "[4]";
     }
     interfaces->setInterfaceOption(QString("wireless_key"), keyList.join(QString(" ")));
   } else {
     interfaces->removeInterfaceOption(QString("wireless_key"));
   }
   interfaces->removeInterfaceOption(QString("wireless_enc"));
 
   if(!interfaceSetup->saveChanges())
     return;
 
   QDialog::accept();
 }
 
 /*
  * Scan for possible wireless networks around...
  * ... powered by Wellenreiter II technology (C) Michael 'Mickey' Lauer <mickeyl@handhelds.org>
  */
 
 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 ) );
     assert( wiface );
 
     // try to guess device type
     QString devicetype;
     QFile m( "/proc/modules" );
     if ( m.open( IO_ReadOnly ) )
     {
         QString line;
         QTextStream modules( &m );
         while( !modules.atEnd() && !devicetype )
         {
             modules >> line;
             if ( line.contains( "cisco" ) ) devicetype = "cisco";
             else if ( line.contains( "hostap" ) ) devicetype = "hostap";
             else if ( line.contains( "prism" ) ) devicetype = "wlan-ng"; /* puke */
             else if ( line.contains( "orinoco" ) ) devicetype = "orinoco";
         }
     }
     if ( devicetype.isEmpty() )
     {
         owarn << "rescanNeighbourhood(): couldn't guess device type :(" << oendl; 
         return;
     }
     else
     {
-        odebug << "rescanNeighbourhood(): device type seems to be '" << (const char*) devicetype << "'" << oendl; 
+        odebug << "rescanNeighbourhood(): device type seems to be '" << devicetype << "'" << oendl; 
     }
 
     // configure interface to receive 802.11 management frames
 
     wiface->setUp( true );
     wiface->setPromiscuousMode( true );
 
     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
     {
         odebug << "rescanNeighbourhood(): unsupported device type for monitoring :(" << oendl; 
         return;
     }
 
     wiface->setMode( "monitor" );
     if ( wiface->mode() != "monitor" )
     {
         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() )
     {
         owarn << "rescanNeighbourhood(): Unable to open libpcap (" << strerror( errno ) << ")." << oendl; 
         return;
     }
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
@@ -119,65 +119,65 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
 
     test_alu->setText( 1, "n/a" );
     test_fpu->setText( 1, "n/a" );
     test_txt->setText( 1, "n/a" );
     test_gfx->setText( 1, "n/a" );
     test_ram->setText( 1, "n/a" );
     test_sd->setText( 1, "n/a" );
     test_cf->setText( 1, "n/a" );
 
     test_alu->setText( 2, "n/a" );
     test_fpu->setText( 2, "n/a" );
     test_txt->setText( 2, "n/a" );
     test_gfx->setText( 2, "n/a" );
     test_ram->setText( 2, "n/a" );
     test_sd->setText( 2, "n/a" );
     test_cf->setText( 2, "n/a" );
 
     startButton = new QPushButton( tr( "&Start Tests!" ), this );
     QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) );
     connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) );
     vb->addWidget( tests, 2 );
 
     QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" );
     if ( f.open( IO_ReadOnly ) )
     {
         machineCombo = new QComboBox( this );
         QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) );
 
         QTextStream ts( &f );
         while( !ts.eof() )
         {
             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 ) ) );
             machineCombo->insertItem( machline );
         }
 
         QHBoxLayout* hb = new QHBoxLayout( vb );
         hb->addWidget( new QLabel( tr( "Compare To:" ), this ) );
         hb->addWidget( machineCombo, 2 );
         connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) );
     }
 
     vb->addWidget( startButton, 2 );
 }
 
 
 BenchmarkInfo::~BenchmarkInfo()
 {}
 
 
 void BenchmarkInfo::machineActivated( int index )
 {
     QStringList* results = machines[ machineCombo->text( index ) ];
     if ( !results )
     {
         odebug << "sysinfo: no results available." << oendl; 
         return;
     }
     QStringList::Iterator it = results->begin();
     test_alu->setText( 2, *(it++) );
     test_fpu->setText( 2, *(it++) );
     test_txt->setText( 2, *(it++) );
     test_gfx->setText( 2, *(it++) );