summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-03-30 03:06:07 (UTC)
committer mickeyl <mickeyl>2003-03-30 03:06:07 (UTC)
commit8e1504c3e8b8e5af509147f0b33f4e92a7c1c041 (patch) (side-by-side diff)
treebb3b73b0d14c5f304405d473ed6a3ed381240652
parente1c4cb3364f8f7ff68da88b5ec26053ee561c8a1 (diff)
downloadopie-8e1504c3e8b8e5af509147f0b33f4e92a7c1c041.zip
opie-8e1504c3e8b8e5af509147f0b33f4e92a7c1c041.tar.gz
opie-8e1504c3e8b8e5af509147f0b33f4e92a7c1c041.tar.bz2
very interesting: gcc 2.9x does not handle operator? with mixed types, e.g. operator?(bool,QString,char*), while gcc 3.x does the necessary format conversion.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 5bdc1b3..3bff7c4 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -123,13 +123,13 @@ void Wellenreiter::receivePacket(OPacket* p)
if ( beacon->canIBSS() )
type = "adhoc";
else
type = "managed";
OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
- QString essid = ssid ? ssid->ID() : "<unknown>";
+ QString essid = ssid ? ssid->ID() : 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" ) );
netView()->addNewItem( type, essid, header->macAddress2().toString(), header->usesWep(), channel, 0 );
}