Author: tgoettlicher Date: Tue Feb 17 15:15:56 2009 New Revision: 55557 URL: http://svn.opensuse.org/viewcvs/yast?rev=55557&view=rev Log: - Backported kmachalkova's fix: Fixed crash in Languages filter: redefined sort function for languages so that it does not refer to zypp::ResObjects (zypp::Locale isn't one anymore)(bnc#428355) - V 2.16.49 Modified: branches/SuSE-Linux-11_0-Branch/qt-pkg/VERSION.cmake branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.cc branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.h Modified: branches/SuSE-Linux-11_0-Branch/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/qt-pkg/VERSION.cmake?rev=55557&r1=55556&r2=55557&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/qt-pkg/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/qt-pkg/VERSION.cmake Tue Feb 17 15:15:56 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "48") +SET(VERSION_PATCH "49") Modified: branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes?rev=55557&r1=55556&r2=55557&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes (original) +++ branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes Tue Feb 17 15:15:56 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Feb 16 18:20:50 CET 2009 - tgoettlicher@suse.de + +- Backported kmachalkova's fix: + Fixed crash in Languages filter: redefined sort function for + languages so that it does not refer to zypp::ResObjects + (zypp::Locale isn't one anymore)(bnc#428355) +- V 2.16.49 + +------------------------------------------------------------------- Tue Aug 12 17:55:03 CEST 2008 - dmacvicar@suse.de - package list should be sorted locale aware Modified: branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.cc?rev=55557&r1=55556&r2=55557&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.cc (original) +++ branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.cc Tue Feb 17 15:15:56 2009 @@ -286,4 +286,26 @@ _pkgObjList->sendStatusChanged(); } + +bool +YQPkgLangListItem::operator<( const QTreeWidgetItem & otherListViewItem ) const +{ + const YQPkgLangListItem * other = dynamic_cast (&otherListViewItem); + int col = treeWidget()->sortColumn(); + + if ( other ) + { + if ( col == nameCol() ) + { + return ( strcoll( this->zyppLang().code().c_str(), other->zyppLang().code().c_str() ) < 0 ); + } + if ( col == summaryCol() ) + { + return ( strcoll( this->zyppLang().name().c_str(), other->zyppLang().name().c_str() ) < 0 ); + } + } + return QY2ListViewItem::operator<( otherListViewItem ); +} + + #include "YQPkgLangList.moc" Modified: branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.h?rev=55557&r1=55556&r2=55557&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.h (original) +++ branches/SuSE-Linux-11_0-Branch/qt-pkg/src/YQPkgLangList.h Tue Feb 17 15:15:56 2009 @@ -158,6 +158,14 @@ **/ virtual void cycleStatus(); + /** + * Sorting function. Redefined here (bnc#428355) as the one from + * parent YQPkgObjList can't be used - it refers to zyppObj's which + * are NULL here as zypp::Locale is not zypp::ResObject anymore + **/ + virtual bool operator< ( const QTreeWidgetItem & other ) const; + + protected: /** -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org