[med-svn] [aghermann] 29/85: identifier renames and whitespace
andrei zavada
hmmr-guest at alioth.debian.org
Thu Sep 26 23:46:26 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch master
in repository aghermann.
commit d8784f5422fc1c51bcb41c7151254506295dcb0d
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sun Sep 15 02:17:34 2013 +0300
identifier renames and whitespace
---
upstream/src/aghermann/expdesign/dirlevel.hh | 5 ++--
upstream/src/aghermann/expdesign/tree-scanner.cc | 3 +--
upstream/src/aghermann/patterns/patterns.hh | 6 ++---
upstream/src/aghermann/ui/sf/controls_cb.cc | 4 ++--
.../src/aghermann/ui/sf/d/patterns-profiles.cc | 24 ++++++++++++++------
upstream/src/aghermann/ui/sf/sf.cc | 2 +-
upstream/src/aghermann/ui/sf/sf.hh | 2 +-
upstream/src/common/config-validate.hh | 4 ++--
8 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/upstream/src/aghermann/expdesign/dirlevel.hh b/upstream/src/aghermann/expdesign/dirlevel.hh
index ac3fa85..d52c8bd 100644
--- a/upstream/src/aghermann/expdesign/dirlevel.hh
+++ b/upstream/src/aghermann/expdesign/dirlevel.hh
@@ -4,8 +4,8 @@
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-09-12
*
- * Purpose: experimental design primary classes: CStorable
- * class for various ppacks storable at various dir levels
+ * Purpose: experimental design primary classes: CStorable
+ * class for various ppacks storable at various dir levels
*
* License: GPL
*/
@@ -80,6 +80,7 @@ class CStorablePPack {
void touch()
{ saved = false; }
+ protected:
forward_list<confval::SValidator<double>> config_keys_g;
forward_list<confval::SValidator<int>> config_keys_d;
forward_list<confval::SValidator<size_t>> config_keys_z;
diff --git a/upstream/src/aghermann/expdesign/tree-scanner.cc b/upstream/src/aghermann/expdesign/tree-scanner.cc
index 8f02ab4..844d3fd 100644
--- a/upstream/src/aghermann/expdesign/tree-scanner.cc
+++ b/upstream/src/aghermann/expdesign/tree-scanner.cc
@@ -144,7 +144,7 @@ register_intree_source( sigfile::CTypedSource&& F,
string& g_name = (pe = next(pe), *pe),
j_name = (pe = next(pe), *pe),
d_name = (pe = next(pe), *pe);
- string e_name =
+ string e_name =
fs::make_fname_base(
*next(pe),
sigfile::supported_sigfile_extensions,
@@ -355,7 +355,6 @@ scan_tree( TMsmtCollectProgressIndicatorFun user_progress_fun)
J.measurements.erase(D.first);
goto startover;
}
-
list<string> complete_session_set = enumerate_sessions();
// calculate average episode times
diff --git a/upstream/src/aghermann/patterns/patterns.hh b/upstream/src/aghermann/patterns/patterns.hh
index dacd07f..ae9c9c1 100644
--- a/upstream/src/aghermann/patterns/patterns.hh
+++ b/upstream/src/aghermann/patterns/patterns.hh
@@ -240,11 +240,9 @@ struct SPattern : public CStorablePPack {
pattern_length_essential() const
{ return (double)pattern_size_essential() / samplerate; }
- int
- load( const string&);
- int
- save();
+ int load();
+ int save();
int
delete_file();
diff --git a/upstream/src/aghermann/ui/sf/controls_cb.cc b/upstream/src/aghermann/ui/sf/controls_cb.cc
index 98908b0..06b832e 100644
--- a/upstream/src/aghermann/ui/sf/controls_cb.cc
+++ b/upstream/src/aghermann/ui/sf/controls_cb.cc
@@ -143,7 +143,7 @@ bSFGotoPrevArtifact_clicked_cb(
size_t p = SF.cur_vpage();
while ( --p != (size_t)-1 )
- if ( SF.page_has_artifacts( p, false)) {
+ if ( SF.vpage_has_artifacts( p, false)) {
SF.sb_clear();
SF.set_cur_vpage( p);
return;
@@ -161,7 +161,7 @@ bSFGotoNextArtifact_clicked_cb(
return;
size_t p = SF.cur_vpage();
while ( ++p < SF.total_vpages() )
- if ( SF.page_has_artifacts( p)) {
+ if ( SF.vpage_has_artifacts( p)) {
SF.sb_clear();
SF.set_cur_vpage( p);
return;
diff --git a/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc b/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc
index 36eec72..97a1762 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc
@@ -132,6 +132,16 @@ load_patterns()
}
+
+void
+SScoringFacility::SPatternsDialog::
+save_patterns()
+{
+ for ( auto& P : patterns )
+ P.save();
+}
+
+
void
SScoringFacility::SPatternsDialog::
populate_combo()
@@ -162,13 +172,13 @@ populate_combo()
-void
-SScoringFacility::SPatternsDialog::
-save_patterns()
-{
- for ( auto& P : patterns )
- P.save();
-}
+// void
+// SScoringFacility::SPatternsDialog::
+// save_patterns()
+// {
+// for ( auto& P : patterns )
+// P.save();
+// }
void
diff --git a/upstream/src/aghermann/ui/sf/sf.cc b/upstream/src/aghermann/ui/sf/sf.cc
index 835c15a..3e2c309 100644
--- a/upstream/src/aghermann/ui/sf/sf.cc
+++ b/upstream/src/aghermann/ui/sf/sf.cc
@@ -615,7 +615,7 @@ marquee_to_selection()
bool
SScoringFacility::
-page_has_artifacts( const size_t p, const bool search_all) const
+vpage_has_artifacts( const size_t p, const bool search_all) const
{
for ( auto &H : channels )
if ( ! search_all && H.hidden )
diff --git a/upstream/src/aghermann/ui/sf/sf.hh b/upstream/src/aghermann/ui/sf/sf.hh
index 6377706..f75bb99 100644
--- a/upstream/src/aghermann/ui/sf/sf.hh
+++ b/upstream/src/aghermann/ui/sf/sf.hh
@@ -157,7 +157,7 @@ class SScoringFacility
cur_page_score() const
{ return sigfile::SPage::char2score( hypnogram[_cur_page]); }
- bool page_has_artifacts( size_t, bool check_all_channels = true) const;
+ bool vpage_has_artifacts( size_t, bool check_all_channels = true) const;
bool vpage_has_annotations( size_t, const SChannel&) const;
// pagesize
diff --git a/upstream/src/common/config-validate.hh b/upstream/src/common/config-validate.hh
index 65e8596..a44ba16 100644
--- a/upstream/src/common/config-validate.hh
+++ b/upstream/src/common/config-validate.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_COMMON_CONFIG_VALIDATE_H
-#define _AGH_COMMON_CONFIG_VALIDATE_H
+#ifndef AGH_COMMON_CONFIG_VALIDATE_H_
+#define AGH_COMMON_CONFIG_VALIDATE_H_
#include <limits.h>
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list