Ticket #19421: HaikuDepot.diff

File HaikuDepot.diff, 2.1 KB (added by oco, 7 days ago)
  • src/apps/haikudepot/packagemodel/PackageFilter.cpp

    diff --git a/src/apps/haikudepot/packagemodel/PackageFilter.cpp b/src/apps/haikudepot/packagemodel/PackageFilter.cpp
    index b7706a1848..927ef231b6 100644
    a b public:  
    179179        // Every search term must be found in one of the package texts
    180180        for (int32 i = fSearchTerms.CountStrings() - 1; i >= 0; i--) {
    181181            const BString& term = fSearchTerms.StringAt(i);
    182             if (!_TextContains(package->Name(), term)
     182            if (!_TextContains(package->LowerName(), term)
    183183                && !_AcceptsPackageFromPublisher(package, term)
    184184                && !_AcceptsPackageFromLocalizedText(package, term)) {
    185185                return false;
    public:  
    205205private:
    206206    bool _TextContains(BString text, const BString& string) const
    207207    {
    208         text.ToLower();
    209208        int32 index = text.FindFirst(string);
    210209        return index >= 0;
    211210    }
  • src/apps/haikudepot/packagemodel/PackageInfo.cpp

    diff --git a/src/apps/haikudepot/packagemodel/PackageInfo.cpp b/src/apps/haikudepot/packagemodel/PackageInfo.cpp
    index 21edffea09..34d8e1a2b1 100644
    a b PackageInfo::DiffMask(const PackageInfo& other) const  
    164164}
    165165
    166166
     167const BString&
     168PackageInfo::LowerName()
     169{
     170    if (fLowerName.IsEmpty()) {
     171        fLowerName = Name();
     172        fLowerName = fLowerName.ToLower();
     173    }
     174    return fLowerName;
     175}
     176
     177
    167178void
    168179PackageInfo::SetCoreInfo(PackageCoreInfoRef value)
    169180{
  • src/apps/haikudepot/packagemodel/PackageInfo.h

    diff --git a/src/apps/haikudepot/packagemodel/PackageInfo.h b/src/apps/haikudepot/packagemodel/PackageInfo.h
    index 7f66bc6961..53fcd34053 100644
    a b public:  
    4141            const BString&      Name() const
    4242                                    { return fName; }
    4343
     44            const BString&      LowerName();
     45
    4446            PackageCoreInfoRef  CoreInfo() const
    4547                                    { return fCoreInfo; }
    4648            void                SetCoreInfo(PackageCoreInfoRef value);
    private:  
    8183
    8284private:
    8385            BString             fName;
     86            BString             fLowerName;
    8487
    8588            PackageCoreInfoRef  fCoreInfo;
    8689            PackageLocalizedTextRef