Skip to content

Commit 6819be1

Browse files
committed
Refactoring: use smartpointer for Doxygen::searchIndex instance
1 parent f1f8f0e commit 6819be1

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

src/doxygen.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ std::unique_ptr<PageDef> Doxygen::mainPage;
152152
std::unique_ptr<NamespaceDef> Doxygen::globalNamespaceDef;
153153
NamespaceDefMutable *Doxygen::globalScope;
154154
bool Doxygen::parseSourcesNeeded = FALSE;
155-
SearchIndexIntf *Doxygen::searchIndex=0;
155+
std::unique_ptr<SearchIndexIntf> Doxygen::searchIndex;
156156
SymbolMap<Definition>*Doxygen::symbolMap;
157157
ClangUsrMap *Doxygen::clangUsrMap = 0;
158158
Cache<std::string,LookupInfo> *Doxygen::typeLookupCache;

src/doxygen.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class Doxygen
114114
static NamespaceDefMutable *globalScope;
115115
static QCString htmlFileExtension;
116116
static bool parseSourcesNeeded;
117-
static SearchIndexIntf *searchIndex;
117+
static std::unique_ptr<SearchIndexIntf> searchIndex;
118118
static SymbolMap<Definition> *symbolMap;
119119
static ClangUsrMap *clangUsrMap;
120120
static Cache<std::string,LookupInfo> *typeLookupCache;

src/searchindex.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -525,15 +525,11 @@ void initSearchIndexer()
525525
bool externalSearch = Config_getBool(EXTERNAL_SEARCH);
526526
if (searchEngine && serverBasedSearch)
527527
{
528-
Doxygen::searchIndex = new SearchIndexIntf(externalSearch ? SearchIndexIntf::External : SearchIndexIntf::Internal);
529-
}
530-
else // no search engine or pure javascript based search function
531-
{
532-
Doxygen::searchIndex = 0;
528+
Doxygen::searchIndex = std::make_unique<SearchIndexIntf>(externalSearch ? SearchIndexIntf::External : SearchIndexIntf::Internal);
533529
}
534530
}
535531

536532
void finalizeSearchIndexer()
537533
{
538-
delete Doxygen::searchIndex;
534+
Doxygen::searchIndex.reset();
539535
}

0 commit comments

Comments
 (0)