reapack

commit 2bea14d1b31891de1ae76542f5dc56721dad7e74
parent e6bff81d5b405f0fa3da19e9c2947110ed3f68d5
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Sun, 19 Jun 2016 22:00:46 -0400

browser: mild refactoring – rename tab to view

Diffstat:
M
src/browser.cpp
 | 
36
++++++++++++++++++------------------
M
src/browser.hpp
 | 
18
+++++++++---------

2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/browser.cpp b/src/browser.cpp
@@ -63,20 +63,20 @@ void Browser::onInit()
 {
   m_applyBtn = getControl(IDAPPLY);
   m_filterHandle = getControl(IDC_FILTER);
-  m_tabs = getControl(IDC_TABS);
+  m_view = getControl(IDC_TABS);
   m_displayBtn = getControl(IDC_DISPLAY);
   m_actionsBtn = getControl(IDC_ACTIONS);
 
   disable(m_applyBtn);
   disable(m_actionsBtn);
 
-  SendMessage(m_tabs, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("All"));
-  SendMessage(m_tabs, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Queued"));
-  SendMessage(m_tabs, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Installed"));
-  SendMessage(m_tabs, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Out of date"));
-  SendMessage(m_tabs, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Obsolete"));
-  SendMessage(m_tabs, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Uninstalled"));
-  SendMessage(m_tabs, CB_SETCURSEL, 0, 0);
+  SendMessage(m_view, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("All"));
+  SendMessage(m_view, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Queued"));
+  SendMessage(m_view, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Installed"));
+  SendMessage(m_view, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Out of date"));
+  SendMessage(m_view, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Obsolete"));
+  SendMessage(m_view, CB_ADDSTRING, 0, (LPARAM)AUTO_STR("Uninstalled"));
+  SendMessage(m_view, CB_SETCURSEL, 0, 0);
 
   m_list = createControl<ListView>(IDC_PACKAGES, ListView::Columns{
     {AUTO_STR(""), 23},
@@ -716,26 +716,26 @@ Remote Browser::getRemote(const Entry &entry) const
 
 bool Browser::match(const Entry &entry) const
 {
-  switch(currentTab()) {
-  case All:
+  switch(currentView()) {
+  case AllView:
     break;
-  case Queued:
+  case QueuedView:
     if(!m_actions.count(const_cast<Entry *>(&entry)))
       return false;
     break;
-  case Installed:
+  case InstalledView:
     if(!entry.test(InstalledFlag))
       return false;
     break;
-  case OutOfDate:
+  case OutOfDateView:
     if(!entry.test(OutOfDateFlag))
       return false;
     break;
-  case Uninstalled:
+  case UninstalledView:
     if(!entry.test(UninstalledFlag))
       return false;
     break;
-  case Obsolete:
+  case ObsoleteView:
     if(!entry.test(ObsoleteFlag))
       return false;
     break;
@@ -896,7 +896,7 @@ void Browser::updateAction(const int index)
   if(!entry)
     return;
 
-  if(currentTab() == Queued && !m_actions.count(entry)) {
+  if(currentView() == QueuedView && !m_actions.count(entry)) {
     m_list->removeRow(index);
     m_visibleEntries.erase(m_visibleEntries.begin() + index);
     updateDisplayLabel();
@@ -928,9 +928,9 @@ void Browser::selectionDo(const function<void (int)> &func)
   }
 }
 
-auto Browser::currentTab() const -> Tab
+auto Browser::currentView() const -> View
 {
-  return (Tab)SendMessage(m_tabs, CB_GETCURSEL, 0, 0);
+  return (View)SendMessage(m_view, CB_GETCURSEL, 0, 0);
 }
 
 bool Browser::confirm() const
diff --git a/src/browser.hpp b/src/browser.hpp
@@ -88,13 +88,13 @@ private:
     RemoteColumn,
   };
 
-  enum Tab {
-    All,
-    Queued,
-    Installed,
-    OutOfDate,
-    Obsolete,
-    Uninstalled,
+  enum View {
+    AllView,
+    QueuedView,
+    InstalledView,
+    OutOfDateView,
+    ObsoleteView,
+    UninstalledView,
   };
 
   Entry makeEntry(const Package *, const Registry::Entry &) const;
@@ -120,7 +120,7 @@ private:
   void resetActions(int index);
   void updateAction(const int index);
   void selectionDo(const std::function<void (int)> &);
-  Tab currentTab() const;
+  View currentView() const;
   bool confirm() const;
   bool apply();
 
@@ -147,7 +147,7 @@ private:
   std::unordered_set<Entry *> m_actions;
 
   HWND m_filterHandle;
-  HWND m_tabs;
+  HWND m_view;
   HWND m_displayBtn;
   HWND m_actionsBtn;
   ListView *m_list;