[med-svn] [aghermann] 20/23: trivial id renames and emendations

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to tag 1.1.2
in repository aghermann.

commit 64e8cce83581c27fb2540104bd6ecae75fc6c52f
Author: Andrei Zavada <hmmr at frdg>
Date:   Tue Jan 3 14:17:49 2017 +0200

    trivial id renames and emendations
---
 upstream/src/aghermann/ui/dirlevel-storable-adapter.hh |  2 +-
 upstream/src/aghermann/ui/dirlevel-storable-adapter.ii |  9 +++++----
 upstream/src/aghermann/ui/sf/d/artifacts.cc            |  2 +-
 upstream/src/aghermann/ui/sf/d/patterns.cc             |  2 +-
 upstream/src/aghermann/ui/sf/d/rk1968.cc               | 14 +++++++-------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/upstream/src/aghermann/ui/dirlevel-storable-adapter.hh b/upstream/src/aghermann/ui/dirlevel-storable-adapter.hh
index efe0097..8b36fa2 100644
--- a/upstream/src/aghermann/ui/dirlevel-storable-adapter.hh
+++ b/upstream/src/aghermann/ui/dirlevel-storable-adapter.hh
@@ -59,7 +59,7 @@ class SDirlevelStorableAdapter {
 
         SUIVarCollection
                 W_V;
-        void atomic_up()
+        void protected_up()
                 {
                         suppress_w_v = true;
                         W_V.up();
diff --git a/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii b/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii
index 8bf671a..af8d769 100644
--- a/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii
+++ b/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii
@@ -4,7 +4,8 @@
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
  * Initial version:  2013-09-15
  *
- *         Purpose:  
+ *         Purpose:  handle per-user/experiment/subject storable items
+ *                   (sleep waveform patterns, rk1968 scripts)
  *
  *         License:  GPL
  */
@@ -173,7 +174,7 @@ eXProfileList_changed_cb()
         if ( ci != -1 ) {
                 current_profile = profile_by_idx(ci);
                 Pp2 = *current_profile;
-                atomic_up();
+                protected_up();
                 set_profile_manage_buttons_visibility();
         } else {
                 current_profile = profiles.end();
@@ -326,7 +327,7 @@ bXProfileDiscard_clicked_cb()
 
         if ( not profiles.empty() ) {
                 Pp2 = *current_profile;
-                atomic_up();
+                protected_up();
         } else {
                 profiles.emplace_back( Pp2);
                 profiles.back().level = TExpDirLevel::transient;
@@ -347,7 +348,7 @@ bXProfileRevert_clicked_cb()
 
         Pp2 = *current_profile;
 
-        atomic_up();
+        protected_up();
 
         set_profile_manage_buttons_visibility();
 }
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts.cc b/upstream/src/aghermann/ui/sf/d/artifacts.cc
index b318999..7c45547 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts.cc
@@ -174,7 +174,7 @@ SArtifactsDialog (SScoringFacility& p_)
         W_V.reg( eSFADFlatMinRegionSize,             &P.flat_min_size);
         W_V.reg( eSFADFlatPad,                       &P.flat_pad);
 
-        atomic_up();
+        protected_up();
 }
 
 
diff --git a/upstream/src/aghermann/ui/sf/d/patterns.cc b/upstream/src/aghermann/ui/sf/d/patterns.cc
index a70478f..5d2154f 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns.cc
@@ -189,7 +189,7 @@ SPatternsDialog (SScoringFacility& p_)
 
         W_V.reg( eSFFDIncrement,     &increment);
 
-        atomic_up();
+        protected_up();
 }
 
 SScoringFacility::SPatternsDialog::
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968.cc b/upstream/src/aghermann/ui/sf/d/rk1968.cc
index b93239f..2c78af1 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968.cc
@@ -9,6 +9,7 @@
  *         License:  GPL
  */
 
+#include <gtk/gtk.h>
 #include "rk1968.hh"
 
 using namespace std;
@@ -68,8 +69,8 @@ SRK1968Dialog (SScoringFacility& p_)
         gtk_combo_box_set_model_properly(
                 eSFRKProfileList, mSFRKProfiles);
 
-        agh::ui::global::set_mono_font(
-                (GtkWidget*)eSFRKScript, agh::ui::global::css_mono10);
+        // agh::ui::global::set_mono_font(
+        //         (GtkWidget*)eSFRKScript, agh::ui::global::css_mono10);
 
         G_CONNECT_1 (wSFRK, show);
         G_CONNECT_1 (wSFRK, hide);
@@ -82,11 +83,10 @@ SRK1968Dialog (SScoringFacility& p_)
         G_CONNECT_1 (bSFRKProfileRevert,  clicked);
         G_CONNECT_1 (bSFRKProfileDiscard, clicked);
 
-        for ( auto& W : {tSFRKScript} )
-                g_signal_connect(
-                        W, "changed",
-                        (GCallback)eSFRK_any_profile_value_changed_cb,
-                        this);
+        g_signal_connect(
+                tSFRKScript, "changed",
+                (GCallback)eSFRK_any_profile_value_changed_cb,
+                this);
 
         G_CONNECT_1 (bSFRKPreview, toggled);
         G_CONNECT_1 (bSFRKApply,   clicked);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git