From cbab533ff06fd6116f28a5c9a16016d7ca7ffe08 Mon Sep 17 00:00:00 2001 From: coolo Date: Fri, 30 Nov 2007 13:56:02 +0000 Subject: [PATCH] #ifdefed out everything not compiling so it can be ported class by class git-svn-id: http://svn.opensuse.org/svn/yast/branches/tmp/coolo/qt4-port@42558 e0cc52ee-31ee-0310-8b87-e83c4596d67c --- src/pkg/YQPkgConflictList.cc | 22 +++++++++++++++++----- src/pkg/YQPkgDescriptionDialog.cc | 11 ++++++++--- src/pkg/YQPkgDiskUsageList.cc | 9 ++++++--- src/pkg/YQPkgLangList.cc | 6 ++++++ src/pkg/YQPkgList.cc | 14 ++++++++++++-- src/pkg/YQPkgObjList.cc | 17 +++++++++++++---- src/pkg/YQPkgPatchList.cc | 11 +++++++++-- src/pkg/YQPkgPatchList.h | 2 +- src/pkg/YQPkgPatternList.cc | 26 ++++++++++++++++++-------- src/pkg/YQPkgProductList.cc | 2 ++ src/pkg/YQPkgRepoList.cc | 9 ++++++++- src/pkg/YQPkgSelList.cc | 8 +++++++- src/pkg/YQPkgVersionsView.cc | 17 ++++++++++++----- src/pkg/YQPkgVersionsView.h | 2 +- 14 files changed, 120 insertions(+), 36 deletions(-) diff --git a/src/pkg/YQPkgConflictList.cc b/src/pkg/YQPkgConflictList.cc index d09cfc6..840e049 100644 --- a/src/pkg/YQPkgConflictList.cc +++ b/src/pkg/YQPkgConflictList.cc @@ -198,11 +198,10 @@ YQPkgConflictList::saveItemToFile( FILE * file, return; // Write indentation - +#if FIXME for ( int level = 0; level < item->depth(); level++ ) fprintf( file, " " ); - // Write item const Q3CheckListItem * checkListItem = dynamic_cast (item); @@ -237,6 +236,7 @@ YQPkgConflictList::saveItemToFile( FILE * file, child = child->nextSibling(); } } +#endif } @@ -255,6 +255,7 @@ YQPkgConflictList::dumpList( QTreeWidgetItem * parent, if ( longText.isEmpty() ) return; +#if FIXME if ( ! header.isEmpty() ) { parent = new QY2ListViewItem( parent, header ); @@ -292,6 +293,7 @@ YQPkgConflictList::dumpList( QTreeWidgetItem * parent, new QY2ListViewItem( parent, *it ); ++it; } +#endif } @@ -307,7 +309,9 @@ YQPkgConflict::YQPkgConflict( YQPkgConflictList * parentList, , _resolutionsHeader( 0 ) { setBackgroundColor( LIGHT_BLUE ); +#if FIXME setOpen( true ); +#endif formatHeading(); YQPkgConflictList::dumpList( this, fromUTF8( _problem->details() ) ); @@ -323,7 +327,9 @@ YQPkgConflict::formatHeading() QPixmap icon = YQIconPool::normalPkgConflict(); setTextColor( BRIGHT_RED ); +#if FIXME setText( 0, Qt::DisplayRole, fromUTF8( problem()->description() ) ); +#endif setData( 0, Qt::DecorationRole, icon ); } @@ -336,7 +342,9 @@ YQPkgConflict::addSolutions() // how to resolve this conflict _( "Conflict Resolution:" ) ); Q_CHECK_PTR( _resolutionsHeader ); +#if FIXME _resolutionsHeader->setOpen( true ); +#endif _resolutionsHeader->setBackgroundColor( LIGHT_GREY ); zypp::ProblemSolutionList solutions = problem()->solutions(); @@ -358,7 +366,9 @@ YQPkgConflict::paintCell( QPainter * painter, int alignment ) { painter->setFont( YQUI::yqApp()->headingFont() ); +#if FIXME QY2ListViewItem::paintCell( painter, colorGroup, column, width, alignment ); +#endif } @@ -368,6 +378,7 @@ YQPkgConflict::userSelectedResolution() int count = 0; QTreeWidgetItem * item; +#if FIXME while ( item = _resolutionsHeader->topLevelItem(count) ) { YQPkgConflictResolution * res = dynamic_cast (item); @@ -385,6 +396,7 @@ YQPkgConflict::userSelectedResolution() count++; } +#endif return zypp::ProblemSolution_Ptr(); // Null pointer } @@ -396,10 +408,10 @@ YQPkgConflict::userSelectedResolution() YQPkgConflictResolution::YQPkgConflictResolution( QY2CheckListItem * parent, zypp::ProblemSolution_Ptr solution ) : QY2CheckListItem( parent, - fromUTF8( solution->description() ), - /*Q3CheckListItem::RadioButton) */ - , _solution( solution )) + fromUTF8( solution->description() ) ) + /*, Q3CheckListItem::RadioButton) */ { + _solution = solution; YQPkgConflictList::dumpList( this, fromUTF8( solution->details() ) ); } diff --git a/src/pkg/YQPkgDescriptionDialog.cc b/src/pkg/YQPkgDescriptionDialog.cc index f457a82..3d37644 100644 --- a/src/pkg/YQPkgDescriptionDialog.cc +++ b/src/pkg/YQPkgDescriptionDialog.cc @@ -75,7 +75,7 @@ YQPkgDescriptionDialog::YQPkgDescriptionDialog( QWidget * parent, const QString Q_CHECK_PTR( _pkgList ); _pkgList->resize( _pkgList->width(), 80 ); - + // Description view _pkgDescription = new YQPkgDescriptionView( splitter ); @@ -133,7 +133,7 @@ YQPkgDescriptionDialog::filter( const QString & qPkgName ) _pkgList->addPkgItem( *it, tryCastToZyppPkg( zyppObj ) ); } - +#if FIXME // Display description of the first pkg with that name YQPkgObjListItem * firstItem = dynamic_cast ( _pkgList->firstChild() ); @@ -142,6 +142,7 @@ YQPkgDescriptionDialog::filter( const QString & qPkgName ) _pkgDescription->showDetailsIfVisible( firstItem->selectable() ); else _pkgDescription->clear(); +#endif YQUI::ui()->normalCursor(); } @@ -150,7 +151,11 @@ YQPkgDescriptionDialog::filter( const QString & qPkgName ) bool YQPkgDescriptionDialog::isEmpty() const { - return _pkgList->firstChild() == 0; +#if FIXME + return _pkgList->childCount() == 0; +#else + return true; +#endif } diff --git a/src/pkg/YQPkgDiskUsageList.cc b/src/pkg/YQPkgDiskUsageList.cc index 9e035e0..ae8a294 100644 --- a/src/pkg/YQPkgDiskUsageList.cc +++ b/src/pkg/YQPkgDiskUsageList.cc @@ -18,13 +18,12 @@ /-*/ -#define QT3_SUPPORT - #define y2log_component "qt-pkg" #include #include #include +#include //Added by qt3to4: #include @@ -114,7 +113,9 @@ YQPkgDiskUsageList::updateDiskUsage() y2error( "No entry for mount point %s", partitionDu.dir.c_str() ); } +#if FIXME sort(); +#endif postPendingWarnings(); } @@ -149,10 +150,12 @@ YQPkgDiskUsageList::postPendingWarnings() QSize YQPkgDiskUsageList::sizeHint() const { - int width = header()->headerWidth() + #ifdef FIXME + int width = header()->headerWidth() + style().pixelMetric( QStyle::PM_ScrollBarExtent, verticalScrollBar() ); #else + int width = header()->sizeHint().width() + 30; #endif diff --git a/src/pkg/YQPkgLangList.cc b/src/pkg/YQPkgLangList.cc index 0f5047e..81c3d1d 100644 --- a/src/pkg/YQPkgLangList.cc +++ b/src/pkg/YQPkgLangList.cc @@ -36,6 +36,7 @@ YQPkgLangList::YQPkgLangList( QWidget * parent ) y2debug( "Creating language list" ); int numCol = 0; +#if FIXME addColumn( "" ); _statusCol = numCol++; // Translators: Table column heading for language ISO code like "de_DE", "en_US" @@ -45,6 +46,7 @@ YQPkgLangList::YQPkgLangList( QWidget * parent ) // Full (human readable) language / country name like "German (Austria)" addColumn( _( "Language" ) ); _summaryCol = numCol++; setAllColumnsShowFocus( true ); +#endif connect( this, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), this, SLOT ( filter() ) ); @@ -172,12 +174,16 @@ YQPkgLangList::addLangItem( ZyppSel selectable, YQPkgLangListItem * YQPkgLangList::selection() const { +#if FIXME Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; return dynamic_cast (item); +#else + return 0; +#endif } diff --git a/src/pkg/YQPkgList.cc b/src/pkg/YQPkgList.cc index 2d8a057..81b7882 100644 --- a/src/pkg/YQPkgList.cc +++ b/src/pkg/YQPkgList.cc @@ -41,6 +41,7 @@ YQPkgList::YQPkgList( QWidget * parent ) _srpmStatusCol = -42; int numCol = 0; +#if FIXME addColumn( "" ); _statusCol = numCol++; // _statusCol = numCol; addColumn( _( "Package" ) ); _nameCol = numCol++; @@ -71,6 +72,7 @@ YQPkgList::YQPkgList( QWidget * parent ) setAllColumnsShowFocus( true ); createActions(); +#endif createSourceRpmContextMenu(); } @@ -194,6 +196,7 @@ void YQPkgList::setInstallCurrentSourceRpm( bool installSourceRpm, bool selectNextItem ) { +#if FIXME QTreeWidgetItem * listViewItem = selectedItem(); if ( ! listViewItem ) @@ -211,6 +214,7 @@ YQPkgList::setInstallCurrentSourceRpm( bool installSourceRpm, setSelected( item->nextSibling(), true ); // emits signals } } +#endif } @@ -220,6 +224,7 @@ YQPkgList::setInstallListSourceRpms( bool installSourceRpm ) if ( ! _editable ) return; +#if FIXME QTreeWidgetItem * listViewItem = firstChild(); while ( listViewItem ) @@ -233,6 +238,7 @@ YQPkgList::setInstallListSourceRpms( bool installSourceRpm ) listViewItem = listViewItem->nextSibling(); } +#endif } @@ -407,6 +413,7 @@ YQPkgList::exportList( const QString filename, bool interactive ) const // Write all items // +#if FIXME const QTreeWidgetItem * item = firstChild(); while ( item ) @@ -434,7 +441,7 @@ YQPkgList::exportList( const QString filename, bool interactive ) const item = item->nextSibling(); } - +#endif // Clean up if ( file ) @@ -607,8 +614,9 @@ YQPkgListItem::setSourceRpmIcon() YQIconPool::disabledPkgNoInst(); } } - +#if FIXME setPixmap( srpmStatusCol(), icon ); +#endif } @@ -753,6 +761,7 @@ YQPkgListItem::paintCell( QPainter * painter, int width, int alignment ) { +#if FIXME if ( isDimmed() && ! YQUI::ui()->usingVisionImpairedPalette() ) { QColorGroup cg = colorGroup; @@ -795,6 +804,7 @@ YQPkgListItem::paintCell( QPainter * painter, QTreeWidgetItem::paintCell( painter, colorGroup, column, width, alignment ); } } +#endif } diff --git a/src/pkg/YQPkgObjList.cc b/src/pkg/YQPkgObjList.cc index bc35b2d..d088e24 100644 --- a/src/pkg/YQPkgObjList.cc +++ b/src/pkg/YQPkgObjList.cc @@ -267,6 +267,7 @@ YQPkgObjList::statusText( ZyppStatus status ) const void YQPkgObjList::setCurrentStatus( ZyppStatus newStatus, bool doSelectNextItem ) { +#if FIXME QTreeWidgetItem * listViewItem = selectedItem(); if ( ! listViewItem ) @@ -296,6 +297,7 @@ YQPkgObjList::setCurrentStatus( ZyppStatus newStatus, bool doSelectNextItem ) if ( doSelectNextItem ) selectNextItem(); +#endif } @@ -341,6 +343,7 @@ YQPkgObjList::setAllItemStatus( ZyppStatus newStatus, bool force ) void YQPkgObjList::selectNextItem() { +#if FIXME QTreeWidgetItem * item = selectedItem(); if ( item && item->nextSibling() ) @@ -349,6 +352,7 @@ YQPkgObjList::selectNextItem() ensureItemVisible( item->nextSibling() ); // Scroll if necessary setSelected( item->nextSibling(), true ); // Emits signals } +#endif } @@ -519,6 +523,7 @@ YQPkgObjList::installedContextMenu() void YQPkgObjList::updateActions( YQPkgObjListItem * item ) { +#if FIXME if ( !item) item = dynamic_cast ( selectedItem() ); @@ -560,12 +565,14 @@ YQPkgObjList::updateActions( YQPkgObjListItem * item ) actionSetCurrentUpdate->setEnabled( false ); actionSetCurrentProtected->setEnabled( false ); } +#endif } void YQPkgObjList::keyPressEvent( QKeyEvent * event ) { +#if FIXME if ( event ) { unsigned special_combo = ( Qt::ControlButton | Qt::ShiftButton | Qt::AltButton ); @@ -579,7 +586,6 @@ YQPkgObjList::keyPressEvent( QKeyEvent * event ) } } - QTreeWidgetItem * selectedListViewItem = selectedItem(); if ( selectedListViewItem ) @@ -681,8 +687,8 @@ YQPkgObjList::keyPressEvent( QKeyEvent * event ) } } } - - Q3ListView::keyPressEvent( event ); +#endif + QY2ListView::keyPressEvent( event ); } @@ -810,6 +816,7 @@ YQPkgObjList::applyExcludeRules( QTreeWidgetItem * listViewItem ) void YQPkgObjList::exclude( YQPkgObjListItem * item, bool exclude ) { +#if FIXME if ( exclude == item->isExcluded() ) return; @@ -839,6 +846,7 @@ YQPkgObjList::exclude( YQPkgObjListItem * item, bool exclude ) Q3ListView::insertItem( item ); } } +#endif } @@ -1030,6 +1038,7 @@ YQPkgObjListItem::updateStatus() void YQPkgObjListItem::setStatusIcon() { +#if FIXME if ( statusCol() >= 0 ) { bool enabled = editable() && _pkgObjList->editable(); @@ -1066,7 +1075,7 @@ YQPkgObjListItem::setStatusIcon() _selectable->theObj()->summary().c_str() ); } } - +#endif } diff --git a/src/pkg/YQPkgPatchList.cc b/src/pkg/YQPkgPatchList.cc index 25ab535..cf26519 100644 --- a/src/pkg/YQPkgPatchList.cc +++ b/src/pkg/YQPkgPatchList.cc @@ -54,6 +54,7 @@ YQPkgPatchList::YQPkgPatchList( QWidget * parent ) _filterCriteria = RelevantPatches; int numCol = 0; +#if FIXME addColumn( "" ); _statusCol = numCol++; addColumn( _( "Patch" ) ); _nameCol = numCol++; addColumn( _( "Summary" ) ); _summaryCol = numCol++; @@ -75,6 +76,7 @@ YQPkgPatchList::YQPkgPatchList( QWidget * parent ) setSorting( categoryCol() ); fillList(); +#endif y2debug( "Creating patch list done" ); } @@ -233,9 +235,10 @@ YQPkgPatchList::fillList() } } - +#if FIXME if ( ! firstChild() ) message( _( "No patches available." ) ); +#endif y2debug( "patch list filled" ); } @@ -352,12 +355,16 @@ YQPkgPatchList::addPatchItem( ZyppSel selectable, YQPkgPatchListItem * YQPkgPatchList::selection() const { +#if FIXME Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; return dynamic_cast (item); +#else + return 0; +#endif } @@ -588,7 +595,7 @@ YQPkgPatchListItem::applyChanges() * +1 if this > other **/ int -YQPkgPatchListItem::compare( Q3ListViewItem * otherListViewItem, +YQPkgPatchListItem::compare( QTreeWidgetItem * otherListViewItem, int col, bool ascending ) const { diff --git a/src/pkg/YQPkgPatchList.h b/src/pkg/YQPkgPatchList.h index 597b3b2..dbf3cc9 100644 --- a/src/pkg/YQPkgPatchList.h +++ b/src/pkg/YQPkgPatchList.h @@ -273,7 +273,7 @@ public: * * Reimplemented from QListViewItem. **/ - virtual int compare( Q3ListViewItem * other, + virtual int compare( QTreeWidgetItem * other, int col, bool ascending ) const; diff --git a/src/pkg/YQPkgPatternList.cc b/src/pkg/YQPkgPatternList.cc index e7920fa..9a4da5b 100644 --- a/src/pkg/YQPkgPatternList.cc +++ b/src/pkg/YQPkgPatternList.cc @@ -45,6 +45,7 @@ YQPkgPatternList::YQPkgPatternList( QWidget * parent, bool autoFill, bool autoFi y2debug( "Creating pattern list" ); int numCol = 0; +#if FIXME addColumn( "" ); _statusCol = numCol++; // Translators: "Pattern" refers to so-called "installation patterns", @@ -58,10 +59,10 @@ YQPkgPatternList::YQPkgPatternList( QWidget * parent, bool autoFill, bool autoFi // Can use the same colum for "broken" and "satisfied": // Both states are mutually exclusive - + _satisfiedIconCol = _summaryCol; _brokenIconCol = _summaryCol; - + header()->setStretchEnabled( _statusCol , false ); header()->setStretchEnabled( _summaryCol, true ); @@ -79,7 +80,7 @@ YQPkgPatternList::YQPkgPatternList( QWidget * parent, bool autoFill, bool autoFi fillList(); selectSomething(); } - +#endif y2debug( "Creating pattern list done" ); } @@ -214,12 +215,16 @@ YQPkgPatternList::addPatternItem( ZyppSel selectable, YQPkgPatternListItem * YQPkgPatternList::selection() const { +#if FIXME QTreeWidgetItem * item = selectedItem(); if ( ! item ) return 0; return dynamic_cast (item); +#else + return 0; +#endif } @@ -229,6 +234,7 @@ YQPkgPatternList::pkgObjClicked( int button, int col, const QPoint & pos ) { +#if FIXME YQPkgPatternCategoryItem * categoryItem = dynamic_cast (listViewItem); @@ -246,12 +252,14 @@ YQPkgPatternList::pkgObjClicked( int button, { YQPkgObjList::pkgObjClicked( button, listViewItem, col, pos ); } +#endif } void YQPkgPatternList::selectSomething() { +#if FIXME QTreeWidgetItemIterator it( this ); while ( *it ) @@ -268,6 +276,7 @@ YQPkgPatternList::selectSomething() ++it; } +#endif } @@ -346,7 +355,7 @@ YQPkgPatternListItem::compare( QTreeWidgetItem * otherListViewItem, if ( otherCategoryItem ) // Patterns without category should always be sorted return -1; // before any category - return QTreeWidgetItem::compare( otherListViewItem, col, ascending ); + return false; //FIXME QTreeWidgetItem::compare( otherListViewItem, col, ascending ); } @@ -380,7 +389,7 @@ YQPkgPatternCategoryItem::paintCell( QPainter * painter, int alignment ) { painter->setFont( YQUI::yqApp()->headingFont() ); - QY2ListViewItem::paintCell( painter, colorGroup, column, width, alignment ); + //FIXME QY2ListViewItem::paintCell( painter, colorGroup, column, width, alignment ); } @@ -403,7 +412,7 @@ YQPkgPatternCategoryItem::addPattern( ZyppPattern pattern ) void YQPkgPatternCategoryItem::setOpen( bool open ) { - QTreeWidgetItem::setOpen( open ); + //FIXME QTreeWidgetItem::setOpen( open ); setTreeIcon(); } @@ -411,11 +420,12 @@ YQPkgPatternCategoryItem::setOpen( bool open ) void YQPkgPatternCategoryItem::setTreeIcon() { +#if FIXME setPixmap( _patternList->statusCol(), isOpen() ? YQIconPool::treeMinus() : YQIconPool::treePlus() ); - +#endif } @@ -443,7 +453,7 @@ YQPkgPatternCategoryItem::compare( QTreeWidgetItem * otherListViewItem, if ( otherPatternListitem ) // Patterns without category should always be sorted return 1; // before any category - return QTreeWidgetItem::compare( otherListViewItem, col, ascending ); + return false; // FIXME QTreeWidgetItem::compare( otherListViewItem, col, ascending ); } diff --git a/src/pkg/YQPkgProductList.cc b/src/pkg/YQPkgProductList.cc index 2f26a51..1951ae5 100644 --- a/src/pkg/YQPkgProductList.cc +++ b/src/pkg/YQPkgProductList.cc @@ -38,6 +38,7 @@ YQPkgProductList::YQPkgProductList( QWidget * parent ) y2debug( "Creating product list" ); int numCol = 0; +#if FIXME addColumn( "" ); _statusCol = numCol++; addColumn( _( "Product" ) ); _nameCol = numCol++; addColumn( _( "Summary" ) ); _summaryCol = numCol++; @@ -49,6 +50,7 @@ YQPkgProductList::YQPkgProductList( QWidget * parent ) setSorting( nameCol() ); fillList(); selectSomething(); +#endif y2debug( "Creating product list done" ); } diff --git a/src/pkg/YQPkgRepoList.cc b/src/pkg/YQPkgRepoList.cc index 798079d..a858297 100644 --- a/src/pkg/YQPkgRepoList.cc +++ b/src/pkg/YQPkgRepoList.cc @@ -46,7 +46,7 @@ YQPkgRepoList::YQPkgRepoList( QWidget * parent ) _urlCol = -1; int numCol = 0; - +#if FIXME // Column headers for repository list addColumn( _( "Name" ) ); _nameCol = numCol++; addColumn( _( "URL" ) ); _urlCol = numCol++; @@ -59,6 +59,7 @@ YQPkgRepoList::YQPkgRepoList( QWidget * parent ) fillList(); selectSomething(); +#endif y2debug( "Creating repository list done" ); } @@ -105,6 +106,7 @@ YQPkgRepoList::filterIfVisible() void YQPkgRepoList::filter() { +#if FIXME emit filterStart(); y2milestone( "Collecting packages in selected repositories..." ); @@ -192,6 +194,7 @@ YQPkgRepoList::filter() y2debug( "Packages sent to package list. Elapsed time: %f sec", stopWatch.elapsed() / 1000.0 ); emit filterFinished(); +#endif } @@ -205,12 +208,16 @@ YQPkgRepoList::addRepo( ZyppRepo repo ) YQPkgRepoListItem * YQPkgRepoList::selection() const { +#if FIXME Q3ListViewItem * item = selectedItem(); if ( ! item ) return 0; return dynamic_cast (item); +#else + return 0; +#endif } diff --git a/src/pkg/YQPkgSelList.cc b/src/pkg/YQPkgSelList.cc index 0ada2ce..989b2cd 100644 --- a/src/pkg/YQPkgSelList.cc +++ b/src/pkg/YQPkgSelList.cc @@ -37,13 +37,15 @@ YQPkgSelList::YQPkgSelList( QWidget * parent, bool autoFill, bool autoFilter ) y2debug( "Creating selection list" ); int numCol = 0; +#if FIXME addColumn( "" ); _statusCol = numCol++; addColumn( _( "Selection" ) ); _summaryCol = numCol++; setAllColumnsShowFocus( true ); +#endif _satisfiedIconCol = _summaryCol; _brokenIconCol = _summaryCol; - + if ( autoFilter ) { connect( this, SIGNAL( selectionChanged( QTreeWidgetItem * ) ), @@ -158,12 +160,16 @@ YQPkgSelList::addPkgSelItem( ZyppSel selectable, YQPkgSelListItem * YQPkgSelList::selection() const { +#if FIXME QTreeWidgetItem * item = selectedItem(); if ( ! item ) return 0; return dynamic_cast (item); +#else + return 0; +#endif } diff --git a/src/pkg/YQPkgVersionsView.cc b/src/pkg/YQPkgVersionsView.cc index ca92b69..40a24e8 100644 --- a/src/pkg/YQPkgVersionsView.cc +++ b/src/pkg/YQPkgVersionsView.cc @@ -50,12 +50,14 @@ YQPkgVersionsView::YQPkgVersionsView( QWidget * parent, bool userCanSwitch ) _nameCol = -42; _summaryCol = -42; +#if FIXME int numCol = 0; addColumn( _( "Version" ) ); _versionCol = numCol++; addColumn( _( "Arch." ) ); _archCol = numCol++; addColumn( _( "Product" ) ); _productCol = numCol++; addColumn( _( "Repository" ) ); _repoCol = numCol++; addColumn( _( "URL" ) ); _urlCol = numCol++; +#endif _statusCol = _productCol; _nameCol = _versionCol; @@ -118,6 +120,7 @@ YQPkgVersionsView::showDetails( ZyppSel selectable ) if ( ! selectable ) return; +#if FIXME QY2CheckListItem * root = new QY2CheckListItem( this, selectable->theObj()->name().c_str(), Q3CheckListItem::Controller ); Q_CHECK_PTR( root ); @@ -149,12 +152,15 @@ YQPkgVersionsView::showDetails( ZyppSel selectable ) if ( selectable->hasInstalledObj() && ! installedIsAvailable ) new YQPkgVersion( this, root, selectable, selectable->installedObj(), false ); + +#endif } void YQPkgVersionsView::checkForChangedCandidate() { +#if FIXME if ( ! firstChild() || ! _selectable ) return; @@ -220,6 +226,7 @@ YQPkgVersionsView::checkForChangedCandidate() item = item->nextSibling(); } +#endif } @@ -239,15 +246,15 @@ YQPkgVersion::YQPkgVersion( YQPkgVersionsView * pkgVersionList, ZyppSel selectable, ZyppObj zyppObj, bool enabled ) - : QY2CheckListItem( parent, "", + : QY2CheckListItem( parent, "" /* enabled ? Q3CheckListItem::RadioButton : - Q3CheckListItem::Controller ) // cheap way to make it read-only + Q3CheckListItem::Controller */ ) // cheap way to make it read-only , _pkgVersionList( pkgVersionList ) , _selectable( selectable ) , _zyppObj( zyppObj ) { - setOn( _zyppObj == _selectable->candidateObj() ); + // FIXME setOn( _zyppObj == _selectable->candidateObj() ); if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() ); if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() ); @@ -274,7 +281,7 @@ YQPkgVersion::YQPkgVersion( YQPkgVersionsView * pkgVersionList, if ( _zyppObj->edition() == _selectable->installedObj()->edition() && _zyppObj->arch() == _selectable->installedObj()->arch() ) { - setPixmap( statusCol(), YQIconPool::pkgKeepInstalled() ); + // FIXME setPixmap( statusCol(), YQIconPool::pkgKeepInstalled() ); setBackgroundColor( QColor( 0xF0, 0xF0, 0xF0 ) ); // light grey setTextColor( QColor( 0, 0x90, 0 ) ); // green } @@ -308,7 +315,7 @@ YQPkgVersion::toolTip(int) * +1 if this > other **/ int -YQPkgVersion::compare( Q3ListViewItem * otherListViewItem, +YQPkgVersion::compare( QTreeWidgetItem * otherListViewItem, int col, bool ascending ) const { diff --git a/src/pkg/YQPkgVersionsView.h b/src/pkg/YQPkgVersionsView.h index 1c9e0e5..250257a 100644 --- a/src/pkg/YQPkgVersionsView.h +++ b/src/pkg/YQPkgVersionsView.h @@ -167,7 +167,7 @@ public: * * Reimplemented from QListViewItem **/ - virtual int compare( Q3ListViewItem * other, + virtual int compare( QTreeWidgetItem * other, int col, bool ascending ) const; -- 2.39.2