diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 16:08:08 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 16:08:08 -0500 |
| commit | e2452caaf2e7f5fb640cda92b87f49f8f4d18c86 (patch) | |
| tree | 417ce934b251ad7a9a86b1725b865ce82f4641ec /gnuradio-core/src/lib/general/gr_prefs.h | |
| parent | b279da79d17ab8cd1bb011c5e6c0305c2a506462 (diff) | |
| parent | bf343e58bc5b4ef026bb4c8722312a6f123becf2 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/general/gr_prefs.cc
Diffstat (limited to 'gnuradio-core/src/lib/general/gr_prefs.h')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_prefs.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gnuradio-core/src/lib/general/gr_prefs.h b/gnuradio-core/src/lib/general/gr_prefs.h index d9b0c791ba..68957faab9 100644 --- a/gnuradio-core/src/lib/general/gr_prefs.h +++ b/gnuradio-core/src/lib/general/gr_prefs.h @@ -46,39 +46,39 @@ public: /*! * \brief Does \p section exist? */ - virtual bool has_section(const std::string section); + virtual bool has_section(const std::string §ion); /*! * \brief Does \p option exist? */ - virtual bool has_option(const std::string section, const std::string option); + virtual bool has_option(const std::string §ion, const std::string &option); /*! * \brief If option exists return associated value; else default_val. */ - virtual const std::string get_string(const std::string section, - const std::string option, - const std::string default_val); + virtual const std::string get_string(const std::string §ion, + const std::string &option, + const std::string &default_val); /*! * \brief If option exists and value can be converted to bool, return it; else default_val. */ - virtual bool get_bool(const std::string section, - const std::string option, + virtual bool get_bool(const std::string §ion, + const std::string &option, bool default_val); /*! * \brief If option exists and value can be converted to long, return it; else default_val. */ - virtual long get_long(const std::string section, - const std::string option, + virtual long get_long(const std::string §ion, + const std::string &option, long default_val); /*! * \brief If option exists and value can be converted to double, return it; else default_val. */ - virtual double get_double(const std::string section, - const std::string option, + virtual double get_double(const std::string §ion, + const std::string &option, double default_val); protected: |