gcc 3.4 fixlets

2 files changed, 27 insertions, 27 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
@@ -107,3 +107,3 @@ void MScanListView::serializeTo( QDataStream& s) const
 {
-    odebug << "serializing MScanListView" << oendl; 
+    odebug << "serializing MScanListView" << oendl;
     OListView::serializeTo( s );
@@ -114,3 +114,3 @@ void MScanListView::serializeFrom( QDataStream& s)
 {
-    odebug << "serializing MScanListView" << oendl; 
+    odebug << "serializing MScanListView" << oendl;
     OListView::serializeFrom( s );
@@ -144,3 +144,3 @@ void MScanListView::addNewItem( const QString& type,
         #ifdef DEBUG
-        odebug << "itemtext: " << item->text( col_essid ) << "" << oendl; 
+        odebug << "itemtext: " << item->text( col_essid ) << "" << oendl;
         #endif
@@ -160,3 +160,3 @@ void MScanListView::addNewItem( const QString& type,
             #ifdef DEBUG
-            odebug << "subitemtext: " << item->text( col_ap ) << "" << oendl; 
+            odebug << "subitemtext: " << item->text( col_ap ) << "" << oendl;
             #endif
@@ -169,3 +169,3 @@ void MScanListView::addNewItem( const QString& type,
             #ifdef DEBUG
-            odebug << "" << macaddr << " is a dupe - ignoring..." << oendl; 
+            odebug << "" << macaddr << " is a dupe - ignoring..." << oendl;
             #endif
@@ -187,3 +187,3 @@ void MScanListView::addNewItem( const QString& type,
     #ifdef DEBUG
-    odebug << "inserting new station " << macaddr << "" << oendl; 
+    odebug << "inserting new station " << macaddr << "" << oendl;
     #endif
@@ -213,3 +213,3 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
         #ifdef DEBUG
-        odebug << "subitemtext: " << subitem->text( col_ap ) << "" << oendl; 
+        odebug << "subitemtext: " << subitem->text( col_ap ) << "" << oendl;
         #endif
@@ -222,3 +222,3 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
         #ifdef DEBUG
-        odebug << "" << addr.toString(true) << " is a dupe - ignoring..." << oendl; 
+        odebug << "" << addr.toString(true) << " is a dupe - ignoring..." << oendl;
         #endif
@@ -247,3 +247,3 @@ void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to,
 {
-    odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << 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;
@@ -265,3 +265,3 @@ void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to,
     {
-        odebug << "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" << oendl; 
+        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!" );
@@ -287,3 +287,3 @@ void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to,
     {
-        odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; 
+        odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl;
         MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" );
@@ -310,3 +310,3 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t
     {
-        odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; 
+        odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl;
         MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
@@ -318,3 +318,3 @@ void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to,
 {
-    owarn << "D'oh! Not yet implemented..." << oendl; 
+    owarn << "D'oh! Not yet implemented..." << oendl;
     MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
@@ -325,3 +325,3 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 {
-    odebug << "identify " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; 
+    odebug << "identify " << (const char*) macaddr.toString() << " = " << ip << "" << oendl;
 
@@ -336,3 +336,3 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
     }
-    odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; 
+    odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl;
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!",
@@ -344,3 +344,3 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
 {
-    odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; 
+    odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << ip << "" << oendl;
 
@@ -361,3 +361,3 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
                 #ifdef DEBUG
-                odebug << "subitemtext: " << subitem->text( col_essid ) << "" << oendl; 
+                odebug << "subitemtext: " << subitem->text( col_essid ) << "" << oendl;
                 #endif
@@ -370,3 +370,3 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
                 #ifdef DEBUG
-                odebug << "" << name << " is a dupe - ignoring..." << oendl; 
+                odebug << "" << name << " is a dupe - ignoring..." << oendl;
                 #endif
@@ -384,3 +384,3 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
     }
-    odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; 
+    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!",
@@ -422,3 +422,3 @@ MScanListItem::MScanListItem( QListView* parent, const QString& type, const QStr
     #ifdef DEBUG
-    odebug << "creating scanlist item" << oendl; 
+    odebug << "creating scanlist item" << oendl;
     #endif
@@ -436,3 +436,3 @@ MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const
     #ifdef DEBUG
-    odebug << "creating scanlist item" << oendl; 
+    odebug << "creating scanlist item" << oendl;
     #endif
@@ -460,3 +460,3 @@ void MScanListItem::serializeTo( QDataStream& s ) const
     #ifdef DEBUG
-    odebug << "serializing MScanListItem" << oendl; 
+    odebug << "serializing MScanListItem" << oendl;
     #endif
@@ -471,3 +471,3 @@ void MScanListItem::serializeFrom( QDataStream& s )
     #ifdef DEBUG
-    odebug << "serializing MScanListItem" << oendl; 
+    odebug << "serializing MScanListItem" << oendl;
     #endif
@@ -475,5 +475,5 @@ void MScanListItem::serializeFrom( QDataStream& s )
 
-    char wep;
+    Q_UINT8 wep;
     s >> _type;
-    s >> (Q_UINT8) wep;
+    s >> wep;
     _wep = (wep == 'y');
@@ -557,3 +557,3 @@ void MScanListItem::receivedBeacon()
     #ifdef DEBUG
-    odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; 
+    odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl;
     #endif
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
@@ -588,3 +588,3 @@ void Wellenreiter::startClicked()
     else
-        pcap->open( QFile( interface ) );
+        pcap->openCaptureFile( interface );