summaryrefslogtreecommitdiff
path: root/noncore
authormickeyl <mickeyl>2004-04-23 14:44:25 (UTC)
committer mickeyl <mickeyl>2004-04-23 14:44:25 (UTC)
commite4433b86449dab80f1a5303f9f5c86d3b9d138c7 (patch) (side-by-side diff)
tree5c15ddef0188d2240c7580346ee7c4028f3b01fa /noncore
parentd8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6 (diff)
downloadopie-e4433b86449dab80f1a5303f9f5c86d3b9d138c7.zip
opie-e4433b86449dab80f1a5303f9f5c86d3b9d138c7.tar.gz
opie-e4433b86449dab80f1a5303f9f5c86d3b9d138c7.tar.bz2
gcc 3.4 fixlets
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index ed9ec14..c605111 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -468,19 +468,19 @@ void MScanListItem::serializeTo( QDataStream& s ) const
void MScanListItem::serializeFrom( QDataStream& s )
{
#ifdef DEBUG
odebug << "serializing MScanListItem" << oendl;
#endif
OListViewItem::serializeFrom( s );
- char wep;
+ Q_UINT8 wep;
s >> _type;
- s >> (Q_UINT8) wep;
+ s >> wep;
_wep = (wep == 'y');
QString name;
name.sprintf( "wellenreiter/%s", (const char*) _type );
setPixmap( col_type, Resource::loadPixmap( name ) );
if ( _wep )
setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
listView()->triggerUpdate();
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 822bde8..40cd105 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -581,17 +581,17 @@ void Wellenreiter::startClicked()
else // write it anyway ;)
{
dumpname = "/var/log/dump.wellenreiter";
}
if ( cardtype != DEVTYPE_FILE )
pcap->open( interface );
else
- pcap->open( QFile( interface ) );
+ pcap->openCaptureFile( interface );
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 ) ));