summaryrefslogtreecommitdiff
path: root/helpcompiler
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2018-06-03 16:00:14 +0300
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-06-11 08:57:06 +0200
commit3bd8759f5ed0393b2cc5560cab1b5d4052bd9728 (patch)
treed48d1325fff62b343fe2d9a0f609f97316485d51 /helpcompiler
parenta901e48579e203a28cc0871ceed0356ae6a5798b (diff)
tdf#96099 Remove some trivial std::vector typedefs
Change-Id: I0e60ec7a3edae42b25ff0917828d0a893ed39a38 Reviewed-on: https://gerrit.libreoffice.org/55245 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'helpcompiler')
-rw-r--r--helpcompiler/inc/HelpCompiler.hxx3
-rw-r--r--helpcompiler/inc/HelpLinker.hxx2
-rw-r--r--helpcompiler/source/HelpCompiler.cxx6
-rw-r--r--helpcompiler/source/HelpLinker.cxx2
4 files changed, 6 insertions, 7 deletions
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index e063bd61f1a7..518830ad62b3 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -153,7 +153,6 @@ struct joaat_hash
typedef std::unordered_map<std::string, std::string, pref_hash> Stringtable;
typedef std::deque<std::string> LinkedList;
-typedef std::vector<std::string> HashSet;
typedef std::unordered_map<std::string, LinkedList, pref_hash> Hashtable;
@@ -165,7 +164,7 @@ public:
std::string document_module;
std::string document_title;
- std::unique_ptr<HashSet> appl_hidlist;
+ std::unique_ptr< std::vector<std::string> > appl_hidlist;
std::unique_ptr<Hashtable> appl_keywords;
std::unique_ptr<Stringtable> appl_helptexts;
xmlDocPtr appl_doc;
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 9002445e3784..366c0a2bf29d 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -63,7 +63,7 @@ public:
private:
Stringtable additionalFiles;
- HashSet helpFiles;
+ std::vector<std::string> helpFiles;
fs::path sourceRoot;
fs::path compactStylesheet;
fs::path embeddStylesheet;
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 2c56ecafc628..1013c8d8e81a 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -246,17 +246,17 @@ public:
std::string documentId;
std::string fileName;
std::string title;
- std::unique_ptr<HashSet> hidlist;
+ std::unique_ptr< std::vector<std::string> > hidlist;
std::unique_ptr<Hashtable> keywords;
std::unique_ptr<Stringtable> helptexts;
private:
- HashSet extendedHelpText;
+ std::vector<std::string> extendedHelpText;
public:
myparser(const std::string &indocumentId, const std::string &infileName,
const std::string &intitle) : documentId(indocumentId), fileName(infileName),
title(intitle)
{
- hidlist.reset(new HashSet);
+ hidlist.reset(new std::vector<std::string>);
keywords.reset(new Hashtable);
helptexts.reset(new Stringtable);
}
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index 6cce931643d3..c8801b14a947 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -382,7 +382,7 @@ void HelpLinker::link()
// add once this as its own id.
addBookmark( pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB);
- const HashSet *hidlist = streamTable.appl_hidlist.get();
+ const std::vector<std::string> *hidlist = streamTable.appl_hidlist.get();
if (hidlist && !hidlist->empty())
{
// now iterate over all elements of the hidlist