1 files changed, 9 insertions, 26 deletions
diff --git a/Source/cmDependsJavaParserHelper.h b/Source/cmDependsJavaParserHelper.h
index a13d023..1597ea7 100644
--- a/Source/cmDependsJavaParserHelper.h
+++ b/Source/cmDependsJavaParserHelper.h
@@ -1,18 +1,12 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+   file Copyright.txt or https://cmake.org/licensing for details.  */
 #ifndef cmDependsJavaParserHelper_h
 #define cmDependsJavaParserHelper_h
 
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <string>
+#include <vector>
 
 #define YYSTYPE cmDependsJavaParserHelper::ParserType
 #define YYSTYPE_IS_DECLARED
@@ -48,7 +42,7 @@ public:
 
   // For yacc
   void AddClassFound(const char* sclass);
-  void PrepareElement(ParserType* opt);
+  void PrepareElement(ParserType* me);
   void DeallocateParserType(char** pt);
   void CheckEmpty(int line, int cnt, ParserType* pt);
   void StartClass(const char* cls);
@@ -69,20 +63,9 @@ private:
   {
   public:
     std::string Name;
-    std::vector<CurrentClass>* NestedClasses;
-    CurrentClass() { this->NestedClasses = new std::vector<CurrentClass>; }
-    ~CurrentClass() { delete this->NestedClasses; }
-    CurrentClass& operator=(CurrentClass const& c)
-    {
-      this->NestedClasses->clear();
-      this->Name = c.Name;
-      std::copy(c.NestedClasses->begin(), c.NestedClasses->end(),
-                std::back_inserter(*this->NestedClasses));
-      return *this;
-    }
-    CurrentClass(CurrentClass const& c) { (*this) = c; }
+    std::vector<CurrentClass> NestedClasses;
     void AddFileNamesForPrinting(std::vector<std::string>* files,
-                                 const char* prefix, const char* sep);
+                                 const char* prefix, const char* sep) const;
   };
   std::string CurrentPackage;
   std::string::size_type InputBufferPos;