reapack

commit 2067a47de22528b4baa891fa7737b6f506837dce
parent 5c47b72847c06074d4c31f066f8defd4349f66b9
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Thu,  5 Jan 2017 04:01:13 -0500

refactoring – rename save and restore to {save,restore}State

Diffstat:
M
src/browser.cpp
 | 
8
++++----
M
src/dialog.cpp
 | 
4
++--
M
src/dialog.hpp
 | 
4
++--
M
src/listview.cpp
 | 
4
++--
M
src/listview.hpp
 | 
4
++--

5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/browser.cpp b/src/browser.cpp
@@ -147,8 +147,8 @@ void Browser::onInit()
   setAnchor(m_applyBtn, AnchorAll);
 
   auto data = m_serializer.read(m_reapack->config()->browser.state, 1);
-  Dialog::restore(data);
-  m_list->restore(data);
+  restoreState(data);
+  m_list->restoreState(data);
   assert(data.empty());
 
   updateDisplayLabel();
@@ -279,8 +279,8 @@ bool Browser::onKeyDown(const int key, const int mods)
 void Browser::onClose()
 {
   Serializer::Data data;
-  Dialog::save(data);
-  m_list->save(data);
+  saveState(data);
+  m_list->saveState(data);
   m_reapack->config()->browser.state = m_serializer.write(data);
 }
 
diff --git a/src/dialog.cpp b/src/dialog.cpp
@@ -377,7 +377,7 @@ void Dialog::setAnchor(HWND handle, const int flags)
   m_resizer.init_itemhwnd(handle, left, top, right, bottom);
 }
 
-void Dialog::restore(Serializer::Data &data)
+void Dialog::restoreState(Serializer::Data &data)
 {
   if(data.size() < 2)
     return;
@@ -396,7 +396,7 @@ void Dialog::restore(Serializer::Data &data)
   data.erase(data.begin(), it);
 }
 
-void Dialog::save(Serializer::Data &data) const
+void Dialog::saveState(Serializer::Data &data) const
 {
   RECT rect;
   GetWindowRect(m_handle, &rect);
diff --git a/src/dialog.hpp b/src/dialog.hpp
@@ -108,8 +108,8 @@ public:
   void setAnchor(HWND, int flags);
   void setMinimumSize(const POINT &p) { m_minimumSize = p; }
 
-  void restore(Serializer::Data &);
-  void save(Serializer::Data &) const;
+  void restoreState(Serializer::Data &);
+  void saveState(Serializer::Data &) const;
 
   void setCloseHandler(const CloseHandler &cb) { m_closeHandler = cb; }
 
diff --git a/src/listview.cpp b/src/listview.cpp
@@ -495,7 +495,7 @@ void ListView::resetColumns()
   }
 }
 
-void ListView::restore(Serializer::Data &data)
+void ListView::restoreState(Serializer::Data &data)
 {
   m_customizable = true;
   setExStyle(LVS_EX_HEADERDRAGDROP, true); // enable column reordering
@@ -537,7 +537,7 @@ void ListView::restore(Serializer::Data &data)
   ListView_SetColumnOrderArray(handle(), columnCount(), &order[0]);
 }
 
-void ListView::save(Serializer::Data &data) const
+void ListView::saveState(Serializer::Data &data) const
 {
   const Sort sort = m_sort.value_or(Sort());
   vector<int> order(columnCount());
diff --git a/src/listview.hpp b/src/listview.hpp
@@ -88,8 +88,8 @@ public:
   void sortByColumn(int index, SortOrder order = AscendingOrder, bool user = false);
   void setSortCallback(int i, const SortCallback &cb) { m_sortFuncs[i] = cb; }
 
-  void restore(Serializer::Data &);
-  void save(Serializer::Data &) const;
+  void restoreState(Serializer::Data &);
+  void saveState(Serializer::Data &) const;
   void resetColumns();
 
   void onSelect(const VoidSignal::slot_type &slot) { m_onSelect.connect(slot); }