Refactoring: modernize g_inputFiles and the parameters of readFileOrDirectory

1 files changed, 11 insertions, 9 deletions

diff --git a/src/doxygen.h b/src/doxygen.h
index 30d136f..275e1b9 100644
--- a/src/doxygen.h
+++ b/src/doxygen.h
@@ -85,7 +85,10 @@ struct LookupInfo
   QCString   resolvedType;
 };
 
-using StringMap = std::unordered_map<std::string,std::string>;
+using StringUnorderedMap = std::unordered_map<std::string,std::string>;
+using StringUnorderedSet = std::unordered_set<std::string>;
+using StringSet          = std::set<std::string>;
+using StringVector       = std::vector<std::string>;
 
 extern QCString g_spaces;
 
@@ -113,13 +116,13 @@ class Doxygen
     static MemberNameLinkedMap      *memberNameLinkedMap;
     static MemberNameLinkedMap      *functionNameLinkedMap;
     static QStrList                  tagfileList;
-    static StringMap                 namespaceAliasMap;
+    static StringUnorderedMap        namespaceAliasMap;
     static GroupSDict               *groupSDict;
     static NamespaceSDict           *namespaceSDict;
     static StringDict                tagDestinationDict;
     static StringDict                aliasDict;
     static QIntDict<MemberGroupInfo> memGrpInfoDict;
-    static std::unordered_set<std::string> expandAsDefinedSet;
+    static StringUnorderedSet        expandAsDefinedSet;
     static NamespaceDef             *globalScope;
     static QCString                  htmlFileExtension;
     static bool                      parseSourcesNeeded;
@@ -151,7 +154,6 @@ void initDoxygen();
 void readConfiguration(int argc, char **argv);
 void checkConfiguration();
 void adjustConfiguration();
-void searchInputFiles(StringList &inputFiles);
 void parseInput();
 void generateOutput();
 void readAliases();
@@ -159,15 +161,15 @@ void readFormulaRepository(QCString dir, bool cmp = FALSE);
 void cleanUpDoxygen();
 int readFileOrDirectory(const char *s,
                         FileNameLinkedMap *fnDict,
-                        StringDict *exclDict,
+                        StringUnorderedSet *exclSet,
                         QStrList *patList,
                         QStrList *exclPatList,
-                        StringList *resultList,
-                        StringDict *resultDict,
+                        StringVector *resultList,
+                        StringUnorderedSet *resultSet,
                         bool recursive,
                         bool errorIfNotExist=TRUE,
-                        std::unordered_set<std::string> *killSet = 0,
-                        std::set<std::string> *paths = 0
+                        StringUnorderedSet *killSet = 0,
+                        StringSet *paths = 0
                        );
 void copyAndFilterFile(const char *fileName,BufStr &dest);