Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / binding / decoder.cpp

diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp
index 28cc30d668e94deddc71ca6f28b8f3645daa5cee..b968ab7995e31227780169b65d4bb2a95b1397ff 100644 (file)
--- a/pv/binding/decoder.cpp
+++ b/pv/binding/decoder.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <libsigrokdecode/libsigrokdecode.h>
@@ -59,8 +58,7 @@ Decoder::Decoder(
        const srd_decoder *const dec = decoder_->decoder();
        assert(dec);
 
-       for (GSList *l = dec->options; l; l = l->next)
-       {
+       for (GSList *l = dec->options; l; l = l->next) {
                const srd_decoder_option *const opt =
                        (srd_decoder_option*)l->data;
 
@@ -116,13 +114,11 @@ Glib::VariantBase Decoder::getter(const char *id)
 
        if (iter != options.end())
                val = (*iter).second;
-       else
-       {
+       else {
                assert(decoder_->decoder());
 
                // Get the default value if not
-               for (GSList *l = decoder_->decoder()->options; l; l = l->next)
-               {
+               for (GSList *l = decoder_->decoder()->options; l; l = l->next) {
                        const srd_decoder_option *const opt =
                                (srd_decoder_option*)l->data;
                        if (strcmp(opt->id, id) == 0) {
@@ -132,10 +128,7 @@ Glib::VariantBase Decoder::getter(const char *id)
                }
        }
 
-       if (val)
-               return Glib::VariantBase(val, true);
-       else
-               return Glib::VariantBase();
+       return (val) ? Glib::VariantBase(val, true) : Glib::VariantBase();
 }
 
 void Decoder::setter(const char *id, Glib::VariantBase value)