From 5ddf877be64a8d6aa12e6f856d3b748c5ba045d4 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Thu, 6 Dec 2012 19:38:15 -0500 Subject: [PATCH] More style fixes, return true or false directly --- src/apps/terminal/Colors.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/apps/terminal/Colors.cpp b/src/apps/terminal/Colors.cpp index 161727dbac..7d89c64a99 100644 --- a/src/apps/terminal/Colors.cpp +++ b/src/apps/terminal/Colors.cpp @@ -85,27 +85,24 @@ struct color_scheme gCustomColorScheme = { }; const color_scheme* gPredefinedColorSchemes[] = { - &kColorSchemeDefault, - &kColorSchemeBlue, - &kColorSchemeMidnight, - &kColorSchemeProfessional, - &kColorSchemeRetro, - &kColorSchemeSlate, - &gCustomColorScheme, - NULL + &kColorSchemeDefault, + &kColorSchemeBlue, + &kColorSchemeMidnight, + &kColorSchemeProfessional, + &kColorSchemeRetro, + &kColorSchemeSlate, + &gCustomColorScheme, + NULL }; bool color_scheme::operator==(const color_scheme& scheme) { - if (text_fore_color == scheme.text_fore_color + return text_fore_color == scheme.text_fore_color && text_back_color == scheme.text_back_color && cursor_fore_color == scheme.cursor_fore_color && cursor_back_color == scheme.cursor_back_color && select_fore_color == scheme.select_fore_color - && select_back_color == scheme.select_back_color) - return true; - - return false; + && select_back_color == scheme.select_back_color; }