Files
libreoffice/helpcompiler/source/HelpSearch.cxx
Stephan Bergmann ad9498f8b8 More -Werror,-Wunused-private-field
...detected with a modified trunk Clang with

> Index: lib/Sema/SemaDeclCXX.cpp
> ===================================================================
> --- lib/Sema/SemaDeclCXX.cpp	(revision 219190)
> +++ lib/Sema/SemaDeclCXX.cpp	(working copy)
> @@ -1917,9 +1917,10 @@
>    const Type *T = FD.getType()->getBaseElementTypeUnsafe();
>    // FIXME: Destruction of ObjC lifetime types has side-effects.
>    if (const CXXRecordDecl *RD = T->getAsCXXRecordDecl())
> -    return !RD->isCompleteDefinition() ||
> -           !RD->hasTrivialDefaultConstructor() ||
> -           !RD->hasTrivialDestructor();
> +    return !RD->hasAttr<WarnUnusedAttr>() &&
> +           (!RD->isCompleteDefinition() ||
> +            !RD->hasTrivialDefaultConstructor() ||
> +            !RD->hasTrivialDestructor());
>    return false;
>  }
>
> @@ -3517,9 +3518,11 @@
>    bool addFieldInitializer(CXXCtorInitializer *Init) {
>      AllToInit.push_back(Init);
>
> +#if 0
>      // Check whether this initializer makes the field "used".
>      if (Init->getInit()->HasSideEffects(S.Context))
>        S.UnusedPrivateFields.remove(Init->getAnyMember());
> +#endif
>
>      return false;
>    }

to warn about members of SAL_WARN_UNUSED-annotated class types, and warn about
initializations with side effects (cf.
<http://lists.cs.uiuc.edu/pipermail/cfe-dev/2014-October/039602.html>
"-Wunused-private-field distracted by side effects").

Change-Id: I3f3181c4eb8180ca28e1fa3dffc9dbe1002c6628
2014-10-15 15:58:56 +02:00

59 lines
2.0 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <helpcompiler/HelpSearch.hxx>
#include <osl/file.hxx>
#include <osl/thread.hxx>
#include "LuceneHelper.hxx"
HelpSearch::HelpSearch(OUString const &indexDir)
{
OUString ustrSystemPath;
osl::File::getSystemPathFromFileURL(indexDir, ustrSystemPath);
d_indexDir = OUStringToOString(ustrSystemPath, osl_getThreadTextEncoding());
}
bool HelpSearch::query(OUString const &queryStr, bool captionOnly,
std::vector<OUString> &rDocuments, std::vector<float> &rScores) {
lucene::index::IndexReader *reader = lucene::index::IndexReader::open(d_indexDir.getStr());
lucene::search::IndexSearcher searcher(reader);
TCHAR captionField[] = L"caption";
TCHAR contentField[] = L"content";
TCHAR *field = captionOnly ? captionField : contentField;
bool isWildcard = queryStr[queryStr.getLength() - 1] == L'*';
std::vector<TCHAR> aQueryStr(OUStringToTCHARVec(queryStr));
lucene::search::Query *pQuery;
if (isWildcard)
pQuery = _CLNEW lucene::search::WildcardQuery(_CLNEW lucene::index::Term(field, &aQueryStr[0]));
else
pQuery = _CLNEW lucene::search::TermQuery(_CLNEW lucene::index::Term(field, &aQueryStr[0]));
lucene::search::Hits *hits = searcher.search(pQuery);
for (unsigned i = 0; i < hits->length(); ++i) {
lucene::document::Document &doc = hits->doc(i); // Document* belongs to Hits.
wchar_t const *path = doc.get(L"path");
rDocuments.push_back(TCHARArrayToOUString(path != 0 ? path : L""));
rScores.push_back(hits->score(i));
}
_CLDELETE(hits);
_CLDELETE(pQuery);
reader->close();
_CLDELETE(reader);
return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */