[yast-commit] r42458 - in /branches/tmp/coolo/qt4-port/src: YQRichText.cc YQRichText.h YQWizard.h pkg/YQPkgGenericDetailsView.h pkg/YQPkgObjList.cc pkg/YQPkgObjList.h

Author: coolo Date: Tue Nov 27 17:22:32 2007 New Revision: 42458 URL: http://svn.opensuse.org/viewcvs/yast?rev=42458&view=rev Log: unhide some virtual overloads - fixing Huha's only complaint :) Modified: branches/tmp/coolo/qt4-port/src/YQRichText.cc branches/tmp/coolo/qt4-port/src/YQRichText.h branches/tmp/coolo/qt4-port/src/YQWizard.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h Modified: branches/tmp/coolo/qt4-port/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRichText.cc?rev=42458&r1=42457&r2=42458&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRichText.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRichText.cc Tue Nov 27 17:22:32 2007 @@ -49,7 +49,6 @@ YUI_CHECK_NEW( _textBrowser ); layout->addWidget( _textBrowser ); - // FIXME _textBrowser->setMimeSourceFactory( 0 ); _textBrowser->installEventFilter( this ); if ( plainTextMode ) Modified: branches/tmp/coolo/qt4-port/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRichText.h?rev=42458&r1=42457&r2=42458&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRichText.h (original) +++ branches/tmp/coolo/qt4-port/src/YQRichText.h Tue Nov 27 17:22:32 2007 @@ -161,7 +161,7 @@ * Reimplemented from QTextBrowser to avoid having an empty text each time * the user clicks on a hyperlink. **/ - virtual void setSource( const QString & name ) {} + virtual void setSource( const QUrl & name ) {} }; Modified: branches/tmp/coolo/qt4-port/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWizard.h?rev=42458&r1=42457&r2=42458&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.h (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.h Tue Nov 27 17:22:32 2007 @@ -711,6 +711,7 @@ , _id( id ) {} + virtual QString text(int index) const { return Q3ListViewItem::text(index); } QString text() const { return Q3ListViewItem::text(0); } QString id() const { return _id; } Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h?rev=42458&r1=42457&r2=42458&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgGenericDetailsView.h Tue Nov 27 17:22:32 2007 @@ -125,6 +125,7 @@ * Show data for the last package. **/ void reload( QWidget * newCurrent ); + virtual void reload() { Q3TextBrowser::reload(); } protected: Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc?rev=42458&r1=42457&r2=42458&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.cc Tue Nov 27 17:22:32 2007 @@ -517,15 +517,11 @@ void -YQPkgObjList::updateActions() -{ - updateActions( dynamic_cast ( selectedItem() ) ); -} - - -void YQPkgObjList::updateActions( YQPkgObjListItem * item ) { + if ( !item) + item = dynamic_cast ( selectedItem() ); + if ( item ) { ZyppSel selectable = item->selectable(); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h?rev=42458&r1=42457&r2=42458&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h Tue Nov 27 17:22:32 2007 @@ -188,17 +188,12 @@ virtual void clear(); /** - * Update the internal actions: What actions are available for 'item'? - **/ - virtual void updateActions( YQPkgObjListItem * item ); - - /** * Update the internal actions for the currently selected item ( if any ). * This only calls updateActions( YQPkgObjListItem * ) with the currently * selected item as argument, so there is normally no need to reimplement * this method, too, if the other one is reimplemented. **/ - virtual void updateActions(); + virtual void updateActions( YQPkgObjListItem * item = 0); /** * Emit an updatePackages() signal. @@ -797,6 +792,7 @@ iterator end() { return _excludeMap.end(); } private: + void updateActions(); ItemMap _excludeMap; YQPkgObjList * _pkgObjList; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org