Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tracker: MimeTypeList style fixes

This commit is contained in:
John Scipione 2014-06-20 18:34:13 -04:00
parent 603e1a2cf2
commit cc334f72b3
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/kits/tracker/MimeTypeList.cpp
View File

@ -40,7 +40,8 @@ All rights reserved.
ShortMimeInfo::ShortMimeInfo(const BMimeType &mimeType) ShortMimeInfo::ShortMimeInfo(const BMimeType &mimeType)
: fCommonMimeType(true) :
fCommonMimeType(true)
{ {
fPrivateName = mimeType.Type(); fPrivateName = mimeType.Type();
@ -60,22 +61,26 @@ ShortMimeInfo::ShortMimeInfo(const BMimeType &mimeType)
ShortMimeInfo::ShortMimeInfo(const char* shortDescription) ShortMimeInfo::ShortMimeInfo(const char* shortDescription)
: fShortDescription(shortDescription) :
fShortDescription(shortDescription)
{ {
} }
const char* const char*
ShortMimeInfo::InternalName() const ShortMimeInfo::InternalName() const
{ {
return fPrivateName.String(); return fPrivateName.String();
} }
const char* const char*
ShortMimeInfo::ShortDescription() const ShortMimeInfo::ShortDescription() const
{ {
return fShortDescription.String(); return fShortDescription.String();
} }
int int
ShortMimeInfo::CompareShortDescription(const ShortMimeInfo* a, ShortMimeInfo::CompareShortDescription(const ShortMimeInfo* a,
const ShortMimeInfo* b) const ShortMimeInfo* b)
@ -83,6 +88,7 @@ ShortMimeInfo::CompareShortDescription(const ShortMimeInfo* a,
return a->fShortDescription.ICompare(b->fShortDescription); return a->fShortDescription.ICompare(b->fShortDescription);
} }
bool bool
ShortMimeInfo::IsCommonMimeType() const ShortMimeInfo::IsCommonMimeType() const
{ {
@ -90,11 +96,12 @@ ShortMimeInfo::IsCommonMimeType() const
} }
// #pragma mark - // #pragma mark - MimeTypeList
MimeTypeList::MimeTypeList() MimeTypeList::MimeTypeList()
: fMimeList(100, true), :
fMimeList(100, true),
fCommonMimeList(30, false), fCommonMimeList(30, false),
fLock("mimeListLock") fLock("mimeListLock")
{ {
@ -103,12 +110,14 @@ MimeTypeList::MimeTypeList()
B_NORMAL_PRIORITY); B_NORMAL_PRIORITY);
} }
static int static int
MatchOneShortDescription(const ShortMimeInfo* a, const ShortMimeInfo* b) MatchOneShortDescription(const ShortMimeInfo* a, const ShortMimeInfo* b)
{ {
return strcasecmp(a->ShortDescription(), b->ShortDescription()); return strcasecmp(a->ShortDescription(), b->ShortDescription());
} }
const ShortMimeInfo* const ShortMimeInfo*
MimeTypeList::FindMimeType(const char* shortDescription) const MimeTypeList::FindMimeType(const char* shortDescription) const
{ {
@ -119,6 +128,7 @@ MimeTypeList::FindMimeType(const char* shortDescription) const
return result; return result;
} }
const ShortMimeInfo* const ShortMimeInfo*
MimeTypeList::EachCommonType(bool (*func)(const ShortMimeInfo*, void*), MimeTypeList::EachCommonType(bool (*func)(const ShortMimeInfo*, void*),
void* state) const void* state) const
@ -129,9 +139,11 @@ MimeTypeList::EachCommonType(bool (*func)(const ShortMimeInfo*, void*),
if ((func)(fCommonMimeList.ItemAt(index), state)) if ((func)(fCommonMimeList.ItemAt(index), state))
return fCommonMimeList.ItemAt(index); return fCommonMimeList.ItemAt(index);
} }
return NULL; return NULL;
} }
void void
MimeTypeList::Build() MimeTypeList::Build()
{ {
@ -158,6 +170,7 @@ MimeTypeList::Build()
if (mimeInfo->IsCommonMimeType()) if (mimeInfo->IsCommonMimeType())
fCommonMimeList.AddItem(mimeInfo); fCommonMimeList.AddItem(mimeInfo);
} }
fCommonMimeList.SortItems(&ShortMimeInfo::CompareShortDescription); fCommonMimeList.SortItems(&ShortMimeInfo::CompareShortDescription);
fLock.Unlock(); fLock.Unlock();
} }

10
src/kits/tracker/MimeTypeList.h
View File

@ -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. names are registered trademarks or trademarks of their respective holders.
All rights reserved. All rights reserved.
*/ */
#ifndef __MIME_TYPE_LIST__ #ifndef _MIME_TYPE_LIST_H
#define __MIME_TYPE_LIST__ #define _MIME_TYPE_LIST_H
#include <ObjectList.h>
#include <String.h> #include <String.h>
#include "ObjectList.h"
#include "Utilities.h" #include "Utilities.h"
@ -90,4 +91,5 @@ private:
using namespace BPrivate; using namespace BPrivate;
#endif // __MIME_TYPE_LIST__
#endif // _MIME_TYPE_LIST_H