From 1c9903093523953f29315630de64ff86c27166b5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 28 Jul 2010 14:45:54 +0000 Subject: [PATCH] * Style fixes pointed out by Axel. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37789 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/locale/Collator.h | 2 -- src/kits/locale/Collator.cpp | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/headers/os/locale/Collator.h b/headers/os/locale/Collator.h index 92d8c6ae8f..fe46a343d0 100644 --- a/headers/os/locale/Collator.h +++ b/headers/os/locale/Collator.h @@ -2,8 +2,6 @@ * Copyright 2003-2010, Haiku, Inc. * Distributed under the terms of the MIT Licence. */ - - #ifndef _COLLATOR_H_ #define _COLLATOR_H_ diff --git a/src/kits/locale/Collator.cpp b/src/kits/locale/Collator.cpp index 38a0782a4c..7af0b91b50 100644 --- a/src/kits/locale/Collator.cpp +++ b/src/kits/locale/Collator.cpp @@ -120,7 +120,7 @@ BCollator::GetSortKey(const char *string, BString *key, int8 strength) if (strength == B_COLLATE_DEFAULT) strength = fStrength; Collator::ECollationStrength icuStrength; - switch(strength) { + switch (strength) { case B_COLLATE_PRIMARY: icuStrength = Collator::PRIMARY; break; @@ -164,8 +164,7 @@ BCollator::GetSortKey(const char *string, BString *key, int8 strength) if (error == U_ZERO_ERROR) return B_OK; - else - return B_ERROR; + return B_ERROR; } @@ -176,7 +175,7 @@ BCollator::Compare(const char *a, const char *b, int32 length, int8 strength) if (strength == B_COLLATE_DEFAULT) strength = fStrength; Collator::ECollationStrength icuStrength; - switch(strength) { + switch (strength) { case B_COLLATE_PRIMARY: icuStrength = Collator::PRIMARY; break; @@ -228,8 +227,7 @@ BCollator::Archive(BMessage *archive, bool deep) const if (error == U_ZERO_ERROR) return status; - else - return B_ERROR; + return B_ERROR; }