From b06390cb17114692a9fd5233d77620b385252480 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Tue, 24 Aug 2004 11:53:43 +0000 Subject: apply megapatch courtesy Holger 'Zecke' Freyther: - bump version to 1.0.3-cvs - fix compile warnings - fix PacketViewer not to scroll, when watching in "real time" - fix appending text to log view - update statistics when tab is getting activated --- (limited to 'noncore/net/wellenreiter/gui/resource.cpp') diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp index cb17f51..13096f2 100644 --- a/noncore/net/wellenreiter/gui/resource.cpp +++ b/noncore/net/wellenreiter/gui/resource.cpp @@ -25,11 +25,11 @@ namespace Resource QPixmap loadPixmap( const QString& pix ) { QString filename; - filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); + filename.sprintf( "%s/%s.png", PIXMAPPATH, pix.local8Bit() ); QPixmap pixmap( filename ); if ( pixmap.isNull() ) { - odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; + odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; } return pixmap; }; @@ -37,11 +37,11 @@ QPixmap loadPixmap( const QString& pix ) QIconSet loadIconSet( const QString& pix ) { QString filename; - filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); + filename.sprintf( "%s/%s.png", PIXMAPPATH, pix.local8Bit() ); QPixmap pixmap( filename ); if ( pixmap.isNull() ) { - odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; + odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; } return QIconSet( pixmap ); }; -- cgit v0.9.0.2