[med-svn] [aghermann] 06/23: cplusplusify things

[andrei zavada]

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

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit 96f28123f31dbaf9d397f89dacf8f6e7169c6ad8
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Aug 3 18:41:47 2013 +0300

    cplusplusify things
---
 src/aghermann/ui/mw/loadsave.cc |    5 +++--
 src/aghermann/ui/sf/sf.cc       |   43 ++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/aghermann/ui/mw/loadsave.cc b/src/aghermann/ui/mw/loadsave.cc
index b4899c4..7a7e3d2 100644
--- a/src/aghermann/ui/mw/loadsave.cc
+++ b/src/aghermann/ui/mw/loadsave.cc
@@ -27,7 +27,8 @@ forward_list<pair<const char*, aghui::SExpDesignUI::TColour>>
 saving_colors()
 {
 	using namespace aghui;
-	return forward_list<pair<const char*, SExpDesignUI::TColour>>
+	return move(
+		forward_list<pair<const char*, SExpDesignUI::TColour>>
 		({
 			{"MWNight",	SExpDesignUI::TColour::mw_night	   },
 			{"MWDay",	SExpDesignUI::TColour::mw_day	   },
@@ -73,7 +74,7 @@ saving_colors()
 			{"MFPaper",	SExpDesignUI::TColour::mf_paper      },
 			{"MFTicks",	SExpDesignUI::TColour::mf_ticks      },
 			{"MFLabels",	SExpDesignUI::TColour::mf_labels     }
-		});
+		}));
 }
 } // namespace
 
diff --git a/src/aghermann/ui/sf/sf.cc b/src/aghermann/ui/sf/sf.cc
index 0153b0a..cbcb1a4 100644
--- a/src/aghermann/ui/sf/sf.cc
+++ b/src/aghermann/ui/sf/sf.cc
@@ -9,6 +9,7 @@
  *         License:  GPL
  */
 
+#include <forward_list>
 #include <stdexcept>
 
 #include "common/config-validate.hh"
@@ -804,34 +805,34 @@ update_main_menu_items()
 		all_draw_filtered[2] = {true, true},
 		all_draw_fast    [2] = {true, true},
 		all_draw_zeroline[2] = {true, true};
+
 	for ( const auto& H : channels ) {
-		all_draw_original[0]  = all_draw_original[0] && H.draw_original_signal,
-		all_draw_filtered[0]  = all_draw_filtered[0] && H.draw_filtered_signal,
-		all_draw_fast    [0]  = all_draw_fast    [0] && H.resample_signal,
-		all_draw_zeroline[0]  = all_draw_zeroline[0] && H.draw_zeroline;
-
-		all_draw_original[1]  = all_draw_original[1] && !H.draw_original_signal,
-		all_draw_filtered[1]  = all_draw_filtered[1] && !H.draw_filtered_signal,
-		all_draw_fast    [1]  = all_draw_fast    [1] && !H.resample_signal,
-		all_draw_zeroline[1]  = all_draw_zeroline[1] && !H.draw_zeroline;
+		all_draw_original[0] = all_draw_original[0] &&  H.draw_original_signal,
+		all_draw_filtered[0] = all_draw_filtered[0] &&  H.draw_filtered_signal,
+		all_draw_fast    [0] = all_draw_fast    [0] &&  H.resample_signal,
+		all_draw_zeroline[0] = all_draw_zeroline[0] &&  H.draw_zeroline;
+
+		all_draw_original[1] = all_draw_original[1] && !H.draw_original_signal,
+		all_draw_filtered[1] = all_draw_filtered[1] && !H.draw_filtered_signal,
+		all_draw_fast    [1] = all_draw_fast    [1] && !H.resample_signal,
+		all_draw_zeroline[1] = all_draw_zeroline[1] && !H.draw_zeroline;
 	}
 
 	suppress_redraw = true;
 
-#define KEKE(A,B)						\
-	if ( A[0] )						\
-		gtk_check_menu_item_set_active( B, TRUE);	\
-	else if ( A[1] )					\
-		gtk_check_menu_item_set_active( B, FALSE);	\
-	else							\
-		gtk_check_menu_item_set_inconsistent( B, TRUE);
+	for ( auto& A : forward_list<pair<bool*, GtkCheckMenuItem*>>
+		      ({{all_draw_original, iSFMontageDrawOriginalSignal},
+			{all_draw_filtered, iSFMontageDrawProcessedSignal},
+			{all_draw_fast,     iSFMontageDrawFast},
+			{all_draw_zeroline, iSFMontageDrawZeroLine}}) ) {
 
-	KEKE (all_draw_original, iSFMontageDrawOriginalSignal);
-	KEKE (all_draw_filtered, iSFMontageDrawProcessedSignal);
-	KEKE (all_draw_fast,     iSFMontageDrawFast);
-	KEKE (all_draw_zeroline, iSFMontageDrawZeroLine);
+		if ( A.first[0] )
+			gtk_check_menu_item_set_active( A.second, TRUE);
+		else if ( A.first[1] )
+			gtk_check_menu_item_set_active( A.second, FALSE);
 
-#undef KEKE
+		gtk_check_menu_item_set_inconsistent( A.second, not (A.first[0] xor A.first[1]));
+	}
 
 	suppress_redraw = false;
 }

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