Cleanup

libyui · Jun 26, 2018 · 12b9483 · 12b9483
1 parent fef4086
commit 12b9483
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/src/YQPackageSelector.cc b/src/YQPackageSelector.cc
@@ -1127,9 +1127,9 @@ YQPackageSelector::manualResolvePackageDependencies()
 	return QDialog::Accepted;
     }
 
-    YQUI::ui()->busyCursor();
+    busyCursor();
     int result = _pkgConflictDialog->solveAndShowConflicts();
-    YQUI::ui()->normalCursor();
+    normalCursor();
 
 #if DEPENDENCY_FEEDBACK_IF_OK
 

diff --git a/src/YQPkgServiceList.cc b/src/YQPkgServiceList.cc
@@ -155,11 +155,9 @@ YQPkgServiceList::filter()
         });
 	    query.addKind(zypp::ResKind::package);
 
-    	    for( zypp::PoolQuery::Selectable_iterator it = query.selectableBegin();
-	         it != query.selectableEnd(); it++)
-    	    {
-		emit filterMatch( *it, tryCastToZyppPkg( (*it)->theObj() ) );
-    	    }
+        std::for_each(query.selectableBegin(), query.selectableEnd(), [&](const zypp::ui::Selectable::Ptr &selectable) {
+            emit filterMatch( selectable, tryCastToZyppPkg( selectable->theObj() ) );
+        });
 	}
     }
 
@@ -184,7 +182,7 @@ YQPkgServiceList::selection() const
     QTreeWidgetItem * item = currentItem();
 
     if ( ! item )
-	return 0;
+	return nullptr;
 
     return dynamic_cast<YQPkgServiceListItem *> (item);
 }

diff --git a/src/YQPkgServiceList.h b/src/YQPkgServiceList.h
@@ -32,8 +32,6 @@ class YQPkgServiceListItem;
 
 // just a service name
 typedef std::string	ZyppService;
-// set of repositories
-typedef std::set<zypp::Repository> ZyppRepositories;
 
 
 /**
@@ -160,12 +158,6 @@ class YQPkgServiceListItem: public QY2ListViewItem
      **/
     ZyppService zyppService() const { return _zyppService; }
 
-    /**
-     * Returns the ZYPP repository this item corresponds to
-     **/
-     // FIXME: probably not needed
-    // ZyppRepositories zyppRepositories() const { return _zyppRepositories; }
-
     /**
      * Returns the parent list
      **/
@@ -191,8 +183,6 @@ class YQPkgServiceListItem: public QY2ListViewItem
     YQPkgServiceList *		_serviceList;
     // the zypp service
     ZyppService			_zyppService;
-    // the repositories belonging to this service
-    ZyppRepositories    _zyppRepositories;
 };