Author: dmacvicar Date: Fri Dec 7 14:41:09 2007 New Revision: 42807 URL: http://svn.opensuse.org/viewcvs/yast?rev=42807&view=rev Log: YQPkgSelDescriptionView QT3_SUPPORT Modified: trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc Modified: trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc?rev=42807&r1=42806&r2=42807&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc (original) +++ trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc Fri Dec 7 14:41:09 2007 @@ -16,13 +16,11 @@ /-*/ -#define QT3_SUPPORT 1 - #define y2log_component "qt-pkg" #include #include -#include +#include <QRegExp> #include "YQPkgSelDescriptionView.h" #include "YQUI.h" @@ -101,8 +99,8 @@ if ( icon.startsWith( "./" ) ) icon.replace( QRegExp( "^\\./" ), "" ); - if ( ! icon.endsWith( ".png", false ) && - ! icon.endsWith( ".jpg", false ) ) + if ( ! icon.endsWith( ".png", Qt::CaseInsensitive ) && + ! icon.endsWith( ".jpg", Qt::CaseInsensitive ) ) icon += ".png"; QString origIconName = icon; @@ -131,7 +129,7 @@ if ( pattern && icon.isEmpty() ) y2warning( "No icon for pattern %s - icon name: %s", - zyppObj->name().c_str(), (const char *) origIconName ); + zyppObj->name().c_str(), qPrintable(origIconName) ); } @@ -163,14 +161,14 @@ QString YQPkgSelDescriptionView::findIcon( const QString & icon ) const { - if ( access( icon, R_OK ) == 0 ) + if ( access( qPrintable(icon), R_OK ) == 0 ) { - y2debug( "Found icon %s", (const char *) icon ); + y2debug( "Found icon %s", qPrintable(icon) ); return icon; } else { - y2debug( "No icon %s", (const char *) icon ); + y2debug( "No icon %s", qPrintable(icon) ); return ""; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org