Fix for unused variable JAVASCRIPT_LICENSE_TEXT.

3 files changed, 30 insertions, 34 deletions

diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
index d231dad..c3aac54 100644
--- a/src/ftvhelp.cpp
+++ b/src/ftvhelp.cpp
@@ -43,6 +43,32 @@
 
 static int folderId=1;
 
+const char *JAVASCRIPT_LICENSE_TEXT = R"LIC(/*
+ @licstart  The following is the entire license notice for the JavaScript code in this file.
+
+ The MIT License (MIT)
+
+ Copyright (C) 1997-2020 by Dimitri van Heesch
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ and associated documentation files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or
+ substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ @licend  The above is the entire license notice for the JavaScript code in this file
+*/
+)LIC";
+
 struct FTVNode
 {
   FTVNode(bool dir,const char *r,const char *f,const char *a,
diff --git a/src/ftvhelp.h b/src/ftvhelp.h
index 5f39b6a..42fe707 100644
--- a/src/ftvhelp.h
+++ b/src/ftvhelp.h
@@ -72,32 +72,7 @@ class FTVHelp : public IndexIntf
     bool m_topLevelIndex;
 };
 
-static const char *JAVASCRIPT_LICENSE_TEXT = R"LIC(/*
- @licstart  The following is the entire license notice for the JavaScript code in this file.
-
- The MIT License (MIT)
-
- Copyright (C) 1997-2020 by Dimitri van Heesch
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- and associated documentation files (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge, publish, distribute,
- sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all copies or
- substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- @licend  The above is the entire license notice for the JavaScript code in this file
-*/
-)LIC";
-
+extern const char *JAVASCRIPT_LICENSE_TEXT;
 
 #endif /* FTVHELP_H */
 
diff --git a/src/pre.l b/src/pre.l
index d975127..eea1418 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -40,7 +40,6 @@
 #include <qdict.h>
 #include <qregexp.h>
 #include <qfileinfo.h>
-#include <qdir.h>
   
 #include "pre.h"
 #include "constexp.h"
@@ -351,10 +350,12 @@ struct preYY_state
   QCString           defArgsStr;
   QCString           defExtraSpacing;
   bool               defVarArgs;
-  int                level;
   int                lastCContext;
   int                lastCPPContext;
+
+  int                level;
   QArray<bool>       levelGuard;
+
   BufStr            *inputBuf = 0;
   yy_size_t          inputBufPos;
   BufStr            *outputBuf = 0;
@@ -3014,12 +3015,6 @@ static void readIncludeFile(yyscan_t yyscanner,const QCString &inc)
       if (oldFileDef)
       {
 	bool ambig;
-	//QCString absPath = incFileName;
-	//if (QDir::isRelativePath(incFileName))
-	//{
-	//  absPath = QDir::cleanDirPath(oldFileDef->getPath()+"/"+incFileName);
-	//  //printf("%s + %s -> resolved path %s\n",oldFileDef->getPath().data(),incFileName.data(),absPath.data());
-	//}
 
 	// change to absolute name for bug 641336 
 	FileDef *fd = findFileDef(Doxygen::inputNameDict,absIncFileName,ambig);