1 files changed, 4 insertions, 45 deletions
diff --git a/server/src/macrolist.h b/server/src/macrolist.h
index 4c73ded..51a30ec 100644
--- a/server/src/macrolist.h
+++ b/server/src/macrolist.h
@@ -28,55 +28,14 @@
 #ifndef __PRACRO_MACROLIST_H__
 #define __PRACRO_MACROLIST_H__
 
-#include <map>
-#include <string>
-#include "versionstr.h"
-#include "mutex.h"
+#include "entitylist.h"
 
-#include "inotify.h"
-
-#include "exception.h"
-
-/**
- * The Items contained in the MacroList.
- */
-typedef std::map<VersionStr, std::string> MacroListItem;
-
-/**
- * The MacroList class is intended for macro file caching, so that all macros
- * do not need to be parsed on each macro query.
- * It builds a list of macros and versions based on the informations read from
- * the MacroHeaderParser.
- * This means that just because a macro gets into the list doesn't means that it
- * will validate as a correct macro (not even nessecarily correct XML).
- */
-class MacroList : public std::map<std::string, MacroListItem > {
+class MacroList : public EntityList {
 public:
-  /**
-   * Constructor.
-   * @param macropath A std::string containing the path in which we should look
-   * for xml files.
-   */
-  MacroList(std::string macropath);
-  
-  /**
-   * Convenience method, to gain the filename of the latest version of a given macro.
-   * This method throws an Exception if the macro does not exist in the tree.
-   * @param macro A std::string containing the name of the wanted macro.
-   * @return A std::string containing the file containing the macro with full path
-   * included.
-   */
-  std::string getLatestVersion(std::string macro) throw(Exception);
+  MacroList(std::string path);
 
-private:
-  bool removeFile(std::string file);
+protected:
   void addFile(std::string file);
-  void updateFile(std::string file);
-  void updateList();
-
-  Mutex mutex;
-  INotify inotify;
-  std::string macropath;
 };
 
 #endif/*__PRACRO_MACROLIST_H__*/