Addon include fixes.

Addon has no need to know anything about AddonManager, so removed those includes.

SVN-Revision: 5782

diff --git a/src/addon/addon.cpp b/src/addon/addon.cpp
index 3771161..ff3ea21 100644 (file)
--- a/src/addon/addon.cpp
+++ b/src/addon/addon.cpp
@@ -27,7 +27,6 @@
 #include "lisp/writer.hpp"
 #include "lisp/parser.hpp"
 #include "addon/addon.hpp"
-#include "addon/addon_manager.hpp"
 #include "log.hpp"
 #include "addon/md5.hpp"
 

diff --git a/src/addon/addon.hpp b/src/addon/addon.hpp
index a07be26..1b5f4f3 100644 (file)
--- a/src/addon/addon.hpp
+++ b/src/addon/addon.hpp
@@ -29,8 +29,6 @@ class Writer;
 class Lisp;
 }
 
-#include "addon/addon_manager.hpp"
-
 /**
  * Represents an (available or installed) Add-on, e.g. a level set
  */

diff --git a/src/addon/addon_manager.hpp b/src/addon/addon_manager.hpp
index 26c80f4..0b4889a 100644 (file)
--- a/src/addon/addon_manager.hpp
+++ b/src/addon/addon_manager.hpp
@@ -23,7 +23,12 @@
 
 #include <string>
 #include <vector>
-#include "addon/addon.hpp"
+namespace lisp {
+class Lisp;
+class Writer;
+}
+
+class Addon;
 
 /**
  * Checks for, installs and removes Add-ons