[lmi-commits] [lmi] master 1cf5e56 4/5: Improve concinnity

[Greg Chicares]

branch: master
commit 1cf5e5631e1de1593b7462022cb8a095ea21da84
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Improve concinnity
    
    Instantiating wxBusyCursor requires a dummy name. Choosing different
    names in different places is less good than choosing the same name
    everywhere. The names 'busy' and 'wait' conflicted, one implying
    activity and the other inactivity; 'preoccupied' conveys the sense,
    but a more colorful word is easier to remember.
---
 census_view.cpp          | 6 +++---
 database_view_editor.cpp | 2 +-
 mvc_controller.cpp       | 2 +-
 skeleton.cpp             | 2 +-
 system_command_wx.cpp    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/census_view.cpp b/census_view.cpp
index 6e20a43..a63d702 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -1120,7 +1120,7 @@ void CensusView::apply_changes
     ,bool         for_this_class_only
     )
 {
-    wxBusyCursor wait;
+    wxBusyCursor reverie;
 
     // Case or class default parameters were edited and changed.
     // Compare the default parameters before and after editing;
@@ -1518,7 +1518,7 @@ bool CensusView::DoAllCells(mcenum_emission emission)
 
 void CensusView::UponAddCell(wxCommandEvent&)
 {
-    wxBusyCursor wait;
+    wxBusyCursor reverie;
     Timer timer;
 
     cell_parms().push_back(case_parms()[0]);
@@ -1575,7 +1575,7 @@ void CensusView::UponDeleteCells(wxCommandEvent&)
         return;
         }
 
-    wxBusyCursor wait;
+    wxBusyCursor reverie;
     Timer timer;
 
     wxArrayInt erasures;
diff --git a/database_view_editor.cpp b/database_view_editor.cpp
index 8ed8b4b..1137d51 100644
--- a/database_view_editor.cpp
+++ b/database_view_editor.cpp
@@ -240,7 +240,7 @@ void DatabaseTableAdapter::ReshapeTableData
 
     if(!user_confirm || ConfirmOperation(count))
         {
-        wxBusyCursor busy;
+        wxBusyCursor reverie;
 
         db_value_->reshape(axis_lengths);
         SetModified();
diff --git a/mvc_controller.cpp b/mvc_controller.cpp
index f330735..04a7b68 100644
--- a/mvc_controller.cpp
+++ b/mvc_controller.cpp
@@ -101,7 +101,7 @@ MvcController::MvcController
     // that function is normally quite fast. Messageboxes are not
     // expected to appear in the rest of this ctor unless something
     // is gravely wrong.
-    wxBusyCursor wait;
+    wxBusyCursor reverie;
 
     char const* resource_file_name = view_.ResourceFileName();
     LMI_ASSERT(nullptr != resource_file_name && 0 != 
std::strlen(resource_file_name));
diff --git a/skeleton.cpp b/skeleton.cpp
index dc3ca46..e991bc7 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -1368,7 +1368,7 @@ void 
Skeleton::OpenCommandLineFiles(std::vector<std::string> const& files)
 
 void Skeleton::UpdateViews()
 {
-    wxBusyCursor wait;
+    wxBusyCursor reverie;
 
     // Make a local copy of the list for modification.
     // Bring any active child to front so it's updated first.
diff --git a/system_command_wx.cpp b/system_command_wx.cpp
index ab008de..496ceb4 100644
--- a/system_command_wx.cpp
+++ b/system_command_wx.cpp
@@ -81,7 +81,7 @@ void assemble_console_lines
 void concrete_system_command(std::string const& command_line)
 {
     Timer timer;
-    wxBusyCursor wait;
+    wxBusyCursor reverie;
 
     bool const b =
                                   wxTheApp