From cc334f72b383e595b56b1ed1f16909d72fabe266 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Fri, 20 Jun 2014 18:34:13 -0400 Subject: [PATCH] Tracker: MimeTypeList style fixes --- src/kits/tracker/MimeTypeList.cpp | 25 +++++++++++++++++++------ src/kits/tracker/MimeTypeList.h | 10 ++++++---- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/kits/tracker/MimeTypeList.cpp b/src/kits/tracker/MimeTypeList.cpp index d1fb23010e..5c2f60d089 100644 --- a/src/kits/tracker/MimeTypeList.cpp +++ b/src/kits/tracker/MimeTypeList.cpp @@ -40,7 +40,8 @@ All rights reserved. ShortMimeInfo::ShortMimeInfo(const BMimeType &mimeType) - : fCommonMimeType(true) + : + fCommonMimeType(true) { fPrivateName = mimeType.Type(); @@ -60,22 +61,26 @@ ShortMimeInfo::ShortMimeInfo(const BMimeType &mimeType) ShortMimeInfo::ShortMimeInfo(const char* shortDescription) - : fShortDescription(shortDescription) + : + fShortDescription(shortDescription) { } + const char* ShortMimeInfo::InternalName() const { return fPrivateName.String(); } + const char* ShortMimeInfo::ShortDescription() const { return fShortDescription.String(); } + int ShortMimeInfo::CompareShortDescription(const ShortMimeInfo* a, const ShortMimeInfo* b) @@ -83,6 +88,7 @@ ShortMimeInfo::CompareShortDescription(const ShortMimeInfo* a, return a->fShortDescription.ICompare(b->fShortDescription); } + bool ShortMimeInfo::IsCommonMimeType() const { @@ -90,25 +96,28 @@ ShortMimeInfo::IsCommonMimeType() const } -// #pragma mark - +// #pragma mark - MimeTypeList MimeTypeList::MimeTypeList() - : fMimeList(100, true), - fCommonMimeList(30, false), - fLock("mimeListLock") + : + fMimeList(100, true), + fCommonMimeList(30, false), + fLock("mimeListLock") { fLock.Lock(); Thread::Launch(NewMemberFunctionObject(&MimeTypeList::Build, this), B_NORMAL_PRIORITY); } + static int MatchOneShortDescription(const ShortMimeInfo* a, const ShortMimeInfo* b) { return strcasecmp(a->ShortDescription(), b->ShortDescription()); } + const ShortMimeInfo* MimeTypeList::FindMimeType(const char* shortDescription) const { @@ -119,6 +128,7 @@ MimeTypeList::FindMimeType(const char* shortDescription) const return result; } + const ShortMimeInfo* MimeTypeList::EachCommonType(bool (*func)(const ShortMimeInfo*, void*), void* state) const @@ -129,9 +139,11 @@ MimeTypeList::EachCommonType(bool (*func)(const ShortMimeInfo*, void*), if ((func)(fCommonMimeList.ItemAt(index), state)) return fCommonMimeList.ItemAt(index); } + return NULL; } + void MimeTypeList::Build() { @@ -158,6 +170,7 @@ MimeTypeList::Build() if (mimeInfo->IsCommonMimeType()) fCommonMimeList.AddItem(mimeInfo); } + fCommonMimeList.SortItems(&ShortMimeInfo::CompareShortDescription); fLock.Unlock(); } diff --git a/src/kits/tracker/MimeTypeList.h b/src/kits/tracker/MimeTypeList.h index 1275280500..30d4b19257 100644 --- a/src/kits/tracker/MimeTypeList.h +++ b/src/kits/tracker/MimeTypeList.h @@ -31,12 +31,13 @@ of Be Incorporated in the United States and other countries. Other brand product names are registered trademarks or trademarks of their respective holders. All rights reserved. */ -#ifndef __MIME_TYPE_LIST__ -#define __MIME_TYPE_LIST__ +#ifndef _MIME_TYPE_LIST_H +#define _MIME_TYPE_LIST_H +#include #include -#include "ObjectList.h" + #include "Utilities.h" @@ -90,4 +91,5 @@ private: using namespace BPrivate; -#endif // __MIME_TYPE_LIST__ + +#endif // _MIME_TYPE_LIST_H