Author: mlandres Date: Wed May 27 15:31:23 2009 New Revision: 57340 URL: http://svn.opensuse.org/viewcvs/yast?rev=57340&view=rev Log: Remove use of deprecated Package::filenames. Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgDescriptionView.cc trunk/qt-pkg/src/YQPkgFileListView.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chang... ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Wed May 27 15:31:23 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 27 15:30:54 CEST 2009 - ma@suse.de + +- Remove use of deprecated Package::filenames. + +------------------------------------------------------------------- Fri Apr 3 17:58:35 CEST 2009 - tgoettlicher@suse.de - Fixed confusion caused by patterns (bnc #476965) Modified: trunk/qt-pkg/src/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDescriptionView.c... ============================================================================== --- trunk/qt-pkg/src/YQPkgDescriptionView.cc (original) +++ trunk/qt-pkg/src/YQPkgDescriptionView.cc Wed May 27 15:31:23 2009 @@ -73,7 +73,7 @@ } QString html_text = htmlStart(); - + html_text += htmlHeading( selectable ); QString description = fromUTF8( selectable->theObj()->description() ); @@ -91,16 +91,16 @@ html_text += _("References:"); html_text += "</p>"; html_text += "<ul>"; - + for ( Patch::ReferenceIterator rit = patch->referencesBegin(); rit != patch->referencesEnd(); ++rit ) { - html_text += QString().sprintf("<li>%s (%s) : %s</li>", rit.id().c_str(), rit.type().c_str(), rit.title().c_str() ); + html_text += QString().sprintf("<li>%s (%s) : %s</li>", rit.id().c_str(), rit.type().c_str(), rit.title().c_str() ); } html_text += "</ul>"; } - + // if it is a package, show the support information Package::constPtr package = asKind<Package>(selectable->theObj()); if ( package ) @@ -110,12 +110,17 @@ html_text += _("Supportability: %1").arg( fromUTF8(asUserString(package->vendorSupport()).c_str() )); html_text += "</p>"; } - + // show application names and icons from desktop files if available ZyppPkg installed = tryCastToZyppPkg( selectable->installedObj() ); if ( installed ) { - html_text += applicationIconList( installed->filenames() ); + // ma@: It might be worth passing Package::FileList directly + // instead of copying _all_ filenames into a list first. + // Package::FileList is a query, so it does not eat much memory. + zypp::Package::FileList f( installed->filelist() ); + std::list<std::string> tmp( f.begin(), f.end() ); + html_text += applicationIconList( tmp ); } html_text += htmlEnd(); @@ -161,7 +166,7 @@ if ( foundAuthorsList ) html_text += "</ul>"; - + html_text += "</p>"; return html_text; @@ -253,7 +258,7 @@ desktopEntries["Icon"] = file.value( "Icon" ).toString(); desktopEntries["Exec"] = file.value( "Exec" ).toString(); - // translate Name + // translate Name name = file.value( QString( "Name[%1]" ).arg( langWithCountry ) ).toString(); if ( name.isEmpty() ) @@ -289,7 +294,7 @@ it != fileList.end(); ++it ) { QString line = fromUTF8( *it ); - + if ( line.contains( QRegExp( DESKTOPFILEDIR ) ) ) desktopFiles << line; } Modified: trunk/qt-pkg/src/YQPkgFileListView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgFileListView.cc?r... ============================================================================== --- trunk/qt-pkg/src/YQPkgFileListView.cc (original) +++ trunk/qt-pkg/src/YQPkgFileListView.cc Wed May 27 15:31:23 2009 @@ -56,12 +56,17 @@ QString html = htmlHeading( selectable, true ); // showVersion - + ZyppPkg installed = tryCastToZyppPkg( selectable->installedObj() ); if ( installed ) { - html += formatFileList( installed->filenames() ); + // ma@: It might be worth passing Package::FileList directly + // instead of copying _all_ filenames into a list first. + // Package::FileList is a query, so it does not eat much memory. + zypp::Package::FileList f( installed->filelist() ); + std::list<std::string> tmp( f.begin(), f.end() ); + html += formatFileList( tmp ); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org