From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2100 invoked by alias); 24 Aug 2016 14:16:09 -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 2018 invoked by uid 89); 24 Aug 2016 14:16:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.8 required=5.0 tests=AWL,BAYES_20,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=no version=3.3.2 spammy=H*RU:CriticalPath, Hx-spam-relays-external:CriticalPath, Header, HCc:D*uk X-HELO: rgout0307.bt.lon5.cpcloud.co.uk Received: from rgout0307.bt.lon5.cpcloud.co.uk (HELO rgout0307.bt.lon5.cpcloud.co.uk) (65.20.0.213) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 24 Aug 2016 14:16:04 +0000 X-OWM-Source-IP: 31.51.206.108 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2016.8.24.125417:17:7.944,ip=31.51.206.108,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __CP_POSSIBLE_EXPLOIT_SUBJ, __SUBJ_ALPHA_END, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, BODY_SIZE_3000_3999, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, NO_URI_FOUND, NO_CTA_URI_FOUND, __FROM_DOMAIN_IN_RCPT, RDNS_SUSP, IN_REP_TO, REFERENCES, BODY_SIZE_7000_LESS, NO_URI_HTTPS, MSG_THREAD, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, LEGITIMATE_NEGATE Received: from localhost.localdomain (31.51.206.108) by rgout03.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 57BCDABA00137E80; Wed, 24 Aug 2016 15:16:02 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 2/4] Change PickView::view into an enum Date: Wed, 24 Aug 2016 14:16:00 -0000 Message-Id: <20160824141537.34836-3-jon.turney@dronecode.org.uk> In-Reply-To: <20160824141537.34836-1-jon.turney@dronecode.org.uk> References: <20160824141537.34836-1-jon.turney@dronecode.org.uk> X-SW-Source: 2016-08/txt/msg00083.txt.bz2 Change PickView::view from a class, into an enum Use a C++11 scoped enum so we don't have to change all the uses of it's values. --- PickView.cc | 44 ++++++++++++-------------------------------- PickView.h | 41 +++++++++-------------------------------- 2 files changed, 21 insertions(+), 64 deletions(-) diff --git a/PickView.cc b/PickView.cc index c784a2a..588cfec 100644 --- a/PickView.cc +++ b/PickView.cc @@ -52,15 +52,6 @@ static PickView::Header cat_headers[] = { {0, 0, 0, false} }; -// PickView:: views -const PickView::views PickView::views::Unknown (0); -const PickView::views PickView::views::PackageFull (1); -const PickView::views PickView::views::Package (2); -const PickView::views PickView::views::PackageKeeps (3); -const PickView::views PickView::views::PackageSkips (4); -const PickView::views PickView::views::PackageUserPicked (5); -const PickView::views PickView::views::Category (6); - ATOM PickView::WindowClassAtom = 0; // DoInsertItem - inserts an item into a header control. @@ -152,7 +143,11 @@ PickView::note_width (PickView::Header *hdrs, HDC dc, void PickView::cycleViewMode () { - setViewMode (++view_mode); + PickView::views _value = (PickView::views)((int)view_mode + 1); + if (_value > PickView::views::Category) + _value = PickView::views::PackageFull; + + setViewMode (_value); } void @@ -235,25 +230,19 @@ PickView::setViewMode (views mode) const char * PickView::mode_caption () { - return view_mode.caption (); -} - -const char * -PickView::views::caption () -{ - switch (_value) + switch (view_mode) { - case 1: + case views::PackageFull: return "Full"; - case 2: + case views::Package: return "Pending"; - case 3: + case views::PackageKeeps: return "Up To Date"; - case 4: + case views::PackageSkips: return "Not Installed"; - case 5: + case views::PackageUserPicked: return "Picked"; - case 6: + case views::Category: return "Category"; default: return ""; @@ -348,15 +337,6 @@ PickView::insert_category (Category *cat, bool collapsed) delete &catline; } -PickView::views& -PickView::views::operator++ () -{ - ++_value; - if (_value > Category._value) - _value = 1; - return *this; -} - int PickView::click (int row, int x) { diff --git a/PickView.h b/PickView.h index fd20dc9..054ab4a 100644 --- a/PickView.h +++ b/PickView.h @@ -40,7 +40,7 @@ class PickView : public Window public: virtual bool Create (Window * Parent = NULL, DWORD Style = WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN, RECT * r = NULL); virtual bool registerWindowClass (); - class views; + enum class views; class Header; int num_columns; void defaultTrust (trusts trust); @@ -96,38 +96,15 @@ public: return listheader; } - class views + enum class views { - public: - static const views Unknown; - static const views PackageFull; - static const views Package; - static const views PackageKeeps; - static const views PackageSkips; - static const views PackageUserPicked; - static const views Category; - views ():_value (0) - { - }; - views (int aInt) - { - _value = aInt; - if (_value < 0 || _value > 6) - _value = 0; - } - views & operator++ (); - bool operator == (views const &rhs) - { - return _value == rhs._value; - } - bool operator != (views const &rhs) - { - return _value != rhs._value; - } - const char *caption (); - - private: - int _value; + Unknown, + PackageFull, + Package, + PackageKeeps, + PackageSkips, + PackageUserPicked, + Category, }; class Header -- 2.8.3