From 33ffb061738cff56ce85f86a66920954c0c7c926 Mon Sep 17 00:00:00 2001 From: dmacvicar Date: Fri, 7 Dec 2007 13:41:09 +0000 Subject: [PATCH] YQPkgSelDescriptionView QT3_SUPPORT git-svn-id: http://svn.opensuse.org/svn/yast/trunk/qt4@42807 e0cc52ee-31ee-0310-8b87-e83c4596d67c --- src/pkg/YQPkgSelDescriptionView.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/pkg/YQPkgSelDescriptionView.cc b/src/pkg/YQPkgSelDescriptionView.cc index 621c548..15ad9ae 100644 --- a/src/pkg/YQPkgSelDescriptionView.cc +++ b/src/pkg/YQPkgSelDescriptionView.cc @@ -16,13 +16,11 @@ /-*/ -#define QT3_SUPPORT 1 - #define y2log_component "qt-pkg" #include #include -#include +#include #include "YQPkgSelDescriptionView.h" #include "YQUI.h" @@ -101,8 +99,8 @@ YQPkgSelDescriptionView::htmlHeading( ZyppSel selectable ) 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 @@ YQPkgSelDescriptionView::htmlHeading( ZyppSel selectable ) 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 @@ YQPkgSelDescriptionView::htmlHeading( ZyppSel selectable ) 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 ""; } } -- 2.39.2