Minor refactoring of include checks

1 files changed, 11 insertions, 8 deletions

diff --git a/src/module.h b/src/module.h
index 96e5649..e28677a 100644
--- a/src/module.h
+++ b/src/module.h
@@ -78,12 +78,6 @@ public:
 	LocalScope scope;
 };
 
-struct IncludeFile {
-	std::string filename;
-	bool valid;
-	time_t mtime;
-};
-
 // FIXME: A FileModule doesn't have definition arguments, so we shouldn't really
 // inherit from a Module
 class FileModule : public Module
@@ -95,15 +89,24 @@ public:
 	void setModulePath(const std::string &path) { this->path = path; }
 	const std::string &modulePath() const { return this->path; }
 	void registerInclude(const std::string &localpath, const std::string &fullpath);
+	bool includesChanged() const;
 	bool handleDependencies();
 	virtual AbstractNode *instantiate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx = NULL) const;
+	bool hasIncludes() const { return !this->includes.empty(); }
+	bool usesLibraries() const { return !this->usedlibs.empty(); }
 
 	typedef boost::unordered_map<std::string, class FileModule*> ModuleContainer;
 	ModuleContainer usedlibs;
+private:
+	struct IncludeFile {
+		std::string filename;
+		bool valid;
+		time_t mtime;
+	};
+
+	bool include_modified(const IncludeFile &inc) const;
 	typedef boost::unordered_map<std::string, struct IncludeFile> IncludeContainer;
 	IncludeContainer includes;
-	bool include_modified(struct IncludeFile inc);
-private:
 	bool is_handling_dependencies;
 	std::string path;
 };