From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11176 invoked by alias); 5 Aug 2018 22:09:57 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 11166 invoked by uid 89); 5 Aug 2018 22:09:56 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: rgout03.bt.lon5.cpcloud.co.uk Received: from rgout0305.bt.lon5.cpcloud.co.uk (HELO rgout03.bt.lon5.cpcloud.co.uk) (65.20.0.211) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 05 Aug 2018 22:09:55 +0000 X-OWM-Source-IP: 86.151.121.200 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-SNCR-VADESECURE: CLEAN Received: from localhost.localdomain (86.151.121.200) by rgout03.bt.lon5.cpcloud.co.uk (9.0.019.26-1) (authenticated as jonturney@btinternet.com) id 5B4CE16C01FB5ADC; Sun, 5 Aug 2018 23:09:54 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 03/13] Drop 'using namespace std;' from PickView.cc Date: Sun, 05 Aug 2018 22:09:00 -0000 Message-Id: <20180805220851.270212-4-jon.turney@dronecode.org.uk> In-Reply-To: <20180805220851.270212-1-jon.turney@dronecode.org.uk> References: <20180805220851.270212-1-jon.turney@dronecode.org.uk> X-SW-Source: 2018-08/txt/msg00010.txt.bz2 --- PickView.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/PickView.cc b/PickView.cc index c583eea..57e8f85 100644 --- a/PickView.cc +++ b/PickView.cc @@ -28,8 +28,6 @@ #include "LogSingleton.h" #include "Exception.h" -using namespace std; - static PickView::Header pkg_headers[] = { {"Current", 0, 0, true}, {"New", 0, 0, true}, @@ -248,10 +246,10 @@ PickView::mode_caption (views mode) /* meant to be called on packagemeta::categories */ bool -isObsolete (set &categories) +isObsolete (std::set &categories) { - set ::const_iterator i; - + std::set ::const_iterator i; + for (i = categories.begin (); i != categories.end (); ++i) if (isObsolete (*i)) return true; @@ -295,7 +293,7 @@ PickView::insert_category (Category *cat, bool collapsed) return; PickCategoryLine & catline = *new PickCategoryLine (*this, *cat, 1, collapsed); int packageCount = 0; - for (vector ::iterator i = cat->second.begin (); + for (std::vector ::iterator i = cat->second.begin (); i != cat->second.end () ; ++i) { if (packageFilterString.empty () \ @@ -439,7 +437,7 @@ PickView::init_headers (HDC dc) if (pkg.installed) note_width (headers, dc, pkg.installed.Canonical_version (), HMARGIN, current_col); - for (set::iterator i = pkg.versions.begin (); + for (std::set::iterator i = pkg.versions.begin (); i != pkg.versions.end (); ++i) { if (*i != pkg.installed) -- 2.17.0