From 29449994312b5429486e6dc8b5e557572d99829e Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 31 Dec 2022 00:47:29 +0200
Subject: [PATCH] Comment cleanup and other cosmetic fixes

---
 plugins/android/androidtools.cpp   | 2 --
 plugins/base/compilecommandsjson.h | 2 --
 plugins/gnu/gnucompiler.h          | 7 ++-----
 plugins/gnu/gnulinker.h            | 2 --
 source/lib/builder.h               | 1 -
 source/lib/externaltask.h          | 2 +-
 source/lib/package.h               | 1 -
 source/lib/sourcepackage.h         | 1 -
 source/lib/virtualfilesystem.cpp   | 1 -
 9 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/plugins/android/androidtools.cpp b/plugins/android/androidtools.cpp
index 5053682..bb2cd89 100644
--- a/plugins/android/androidtools.cpp
+++ b/plugins/android/androidtools.cpp
@@ -19,8 +19,6 @@
 using namespace std;
 using namespace Msp;
 
-// TODO Mark problems somewhere instead of throwing exceptions
-
 unsigned parse_version(const std::string &version_str)
 {
 	vector<string> version_parts = split(version_str, '.');
diff --git a/plugins/base/compilecommandsjson.h b/plugins/base/compilecommandsjson.h
index be9c448..1ad6e96 100644
--- a/plugins/base/compilecommandsjson.h
+++ b/plugins/base/compilecommandsjson.h
@@ -6,8 +6,6 @@
 
 class CompileCommandsJson: public FileTarget
 {
-private:
-	
 public:
 	CompileCommandsJson(Builder &, const SourcePackage &);
 
diff --git a/plugins/gnu/gnucompiler.h b/plugins/gnu/gnucompiler.h
index 98c71ed..572e376 100644
--- a/plugins/gnu/gnucompiler.h
+++ b/plugins/gnu/gnucompiler.h
@@ -6,11 +6,8 @@
 class ObjectFile;
 
 /**
-Common base class for GNU compilers.  Turns SourceFiles into ObjectFiles.
-
-Since invocation is mostly the same for all language frontends, most of the
-logic is here and the individual tools only handle creating source files of
-appropriate type.
+The GNU compiler.  Can be created with different tags for different languages.
+Turns SourceFiles into ObjectFiles.
 */
 class GnuCompiler: public Tool
 {
diff --git a/plugins/gnu/gnulinker.h b/plugins/gnu/gnulinker.h
index 11a0fb1..a669bc7 100644
--- a/plugins/gnu/gnulinker.h
+++ b/plugins/gnu/gnulinker.h
@@ -9,8 +9,6 @@ class Binary;
 The GNU linker.  Turns ObjectFiles into Executables and SharedLibraries.  To
 create a shared library, specify "shared" as the second argument to
 create_target.
-
-Uses either gcc or g++ depending on what was used to compile the object files.
 */
 class GnuLinker: public Tool
 {
diff --git a/source/lib/builder.h b/source/lib/builder.h
index 28379ed..62fc214 100644
--- a/source/lib/builder.h
+++ b/source/lib/builder.h
@@ -17,7 +17,6 @@
 #include "toolchain.h"
 #include "virtualfilesystem.h"
 
-class FileTarget;
 class Package;
 class Plugin;
 
diff --git a/source/lib/externaltask.h b/source/lib/externaltask.h
index 9b9bc43..4a78920 100644
--- a/source/lib/externaltask.h
+++ b/source/lib/externaltask.h
@@ -68,7 +68,7 @@ public:
 	void set_stderr(StreamAction);
 
 	/** Returns captured output, if any.  This may be called while the task is
-	still running, but it will always return all output. */
+	still running, but it will always return all output produced so far. */
 	const std::string &get_output() const { return output; }
 
 	/** Executes a command and captures its output.  If the command exits with
diff --git a/source/lib/package.h b/source/lib/package.h
index 8e0c692..9a10991 100644
--- a/source/lib/package.h
+++ b/source/lib/package.h
@@ -9,7 +9,6 @@
 #include "config.h"
 
 class Builder;
-class Package;
 
 /**
 A package is a distributable piece of software.  Package information may be
diff --git a/source/lib/sourcepackage.h b/source/lib/sourcepackage.h
index 2c2e57c..d458c90 100644
--- a/source/lib/sourcepackage.h
+++ b/source/lib/sourcepackage.h
@@ -14,7 +14,6 @@
 #include "package.h"
 #include "toolchain.h"
 
-class Builder;
 class BuildType;
 class FileTarget;
 class SourceArchiveComponent;
diff --git a/source/lib/virtualfilesystem.cpp b/source/lib/virtualfilesystem.cpp
index 16d4de8..714b89c 100644
--- a/source/lib/virtualfilesystem.cpp
+++ b/source/lib/virtualfilesystem.cpp
@@ -4,7 +4,6 @@
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
-#include "csourcefile.h"
 #include "executable.h"
 #include "importlibrary.h"
 #include "sharedlibrary.h"
-- 
2.45.2