This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH setup 01/13] Change packagemeta::_actions to an enum
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: cygwin-apps at cygwin dot com
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Sun, 5 Aug 2018 23:08:39 +0100
- Subject: [PATCH setup 01/13] Change packagemeta::_actions to an enum
- References: <20180805220851.270212-1-jon.turney@dronecode.org.uk>
---
PickCategoryLine.cc | 6 +++---
package_meta.cc | 35 +++++++----------------------------
package_meta.h | 29 +++++++++--------------------
3 files changed, 19 insertions(+), 51 deletions(-)
diff --git a/PickCategoryLine.cc b/PickCategoryLine.cc
index 24fecb3..e428419 100644
--- a/PickCategoryLine.cc
+++ b/PickCategoryLine.cc
@@ -55,7 +55,8 @@ PickCategoryLine::paint (HDC hdc, HRGN hUpdRgn, int x, int y, int row, int show_
// draw the caption ('Default', 'Install', etc)
TextOut (hdc, spin_x + SPIN_WIDTH + ICON_MARGIN, r,
- current_default.caption (), strlen (current_default.caption ()));
+ packagemeta::action_caption (current_default),
+ strlen (packagemeta::action_caption (current_default)));
row++;
}
if (collapsed)
@@ -110,8 +111,7 @@ PickCategoryLine::click (int const myrow, int const ClickedRow, int const x)
{
if ((size_t) x >= spin_x)
{
- ++current_default;
-
+ current_default = (packagemeta::_actions)((current_default + 1) % 4);
return set_action (current_default);
}
else
diff --git a/package_meta.cc b/package_meta.cc
index f765baf..dffe3ac 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -54,35 +54,22 @@ bool hasManualSelections = 0;
/*****************/
-const
- packagemeta::_actions
-packagemeta::Default_action (0);
-const
- packagemeta::_actions
-packagemeta::Install_action (1);
-const
- packagemeta::_actions
-packagemeta::Reinstall_action (2);
-const
- packagemeta::_actions
-packagemeta::Uninstall_action (3);
-
char const *
-packagemeta::_actions::caption ()
+packagemeta::action_caption (_actions _value)
{
switch (_value)
{
- case 0:
+ case Default_action:
return "Default";
- case 1:
+ case Install_action:
return "Install";
- case 2:
+ case Reinstall_action:
return "Reinstall";
- case 3:
+ case Uninstall_action:
return "Uninstall";
}
- // Pacify GCC: (all case options are checked above)
- return 0;
+
+ return "Unknown";
}
packagemeta::packagemeta (packagemeta const &rhs) :
@@ -96,14 +83,6 @@ packagemeta::packagemeta (packagemeta const &rhs) :
}
-packagemeta::_actions & packagemeta::_actions::operator++ ()
-{
- ++_value;
- if (_value > 3)
- _value = 0;
- return *this;
-}
-
template<class T> struct removeCategory : public unary_function<T, void>
{
removeCategory(packagemeta *pkg) : _pkg (pkg) {}
diff --git a/package_meta.h b/package_meta.h
index 8db10e2..df66bda 100644
--- a/package_meta.h
+++ b/package_meta.h
@@ -50,26 +50,15 @@ public:
void setDefaultCategories();
void addToCategoryAll();
- class _actions
- {
- public:
- _actions ():_value (0) {};
- _actions (int aInt) {
- _value = aInt;
- if (_value < 0 || _value > 3)
- _value = 0;
- }
- _actions & operator ++ ();
- bool operator == (_actions const &rhs) { return _value == rhs._value; }
- bool operator != (_actions const &rhs) { return _value != rhs._value; }
- const char *caption ();
- private:
- int _value;
- };
- static const _actions Default_action;
- static const _actions Install_action;
- static const _actions Reinstall_action;
- static const _actions Uninstall_action;
+ enum _actions
+ {
+ Default_action,
+ Install_action,
+ Reinstall_action,
+ Uninstall_action,
+ };
+ static const char *action_caption (_actions value);
+
void set_action (trusts const t);
void set_action (_actions, packageversion const & default_version);
--
2.17.0