Author: kmachalkova Date: Wed Jul 29 16:37:42 2009 New Revision: 58209 URL: http://svn.opensuse.org/viewcvs/yast?rev=58209&view=rev Log: Moving this role to more appropriate place Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.h trunk/control-center/src/moduleiconitem.cpp trunk/control-center/src/moduleiconitem.h trunk/control-center/src/yqmodulesmodel.cpp trunk/control-center/src/yqmodulesmodel.h Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizedso... ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.h (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.h Wed Jul 29 16:37:42 2009 @@ -60,7 +60,6 @@ ///< value won't be shown on the view, is only for sorting purposes. What will ///< be shown as "Category" on the view will be asked with the role ///< CategoryDisplayRole. - GenericNameRole = 0x1BA81D0E }; KCategorizedSortFilterProxyModel(QObject *parent = 0); Modified: trunk/control-center/src/moduleiconitem.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/moduleiconitem... ============================================================================== --- trunk/control-center/src/moduleiconitem.cpp (original) +++ trunk/control-center/src/moduleiconitem.cpp Wed Jul 29 16:37:42 2009 @@ -79,7 +79,7 @@ painter->setPen( inv ); } - QString descr = option.fontMetrics.elidedText( index.data( KCategorizedSortFilterProxyModel::GenericNameRole ).toString(), Qt::ElideRight, option.rect.width() ); + QString descr = option.fontMetrics.elidedText( index.data( YQModulesModel::GenericNameRole ).toString(), Qt::ElideRight, option.rect.width() ); QRect tr = option.rect; tr.setTop( tr.top() + decorationSize.height() + 2*style->pixelMetric( QStyle::PM_FocusFrameVMargin) ); painter->drawText( tr, Qt::AlignLeft | Qt::TextSingleLine, descr ); Modified: trunk/control-center/src/moduleiconitem.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/moduleiconitem... ============================================================================== --- trunk/control-center/src/moduleiconitem.h (original) +++ trunk/control-center/src/moduleiconitem.h Wed Jul 29 16:37:42 2009 @@ -28,7 +28,7 @@ #include <QPainterPath> #include <QRectF> -#include "kcategorizedsortfilterproxymodel.h" +#include "yqmodulesmodel.h" class KCModuleInfo; Modified: trunk/control-center/src/yqmodulesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmodel... ============================================================================== --- trunk/control-center/src/yqmodulesmodel.cpp (original) +++ trunk/control-center/src/yqmodulesmodel.cpp Wed Jul 29 16:37:42 2009 @@ -157,7 +157,7 @@ return groupsModel()->data( idx, Qt::UserRole); } - else if ( role == KCategorizedSortFilterProxyModel::GenericNameRole ) + else if ( role == GenericNameRole ) { //QString tooltip = d->infoProvider.provideInfo( this, index ); Modified: trunk/control-center/src/yqmodulesmodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmodel... ============================================================================== --- trunk/control-center/src/yqmodulesmodel.h (original) +++ trunk/control-center/src/yqmodulesmodel.h Wed Jul 29 16:37:42 2009 @@ -30,10 +30,7 @@ enum UserRoleData { - RawName, - SortKey, - Hidden, - LastColumn + GenericNameRole = 0x1BA81D0E }; YQModulesModel( QObject * parent = 0 ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org