Callback based client implementation is now finished. Testing is up.

1 files changed, 12 insertions, 9 deletions

diff --git a/client/macro.h b/client/macro.h
index 37f706e..e5b116c 100644
--- a/client/macro.h
+++ b/client/macro.h
@@ -37,23 +37,24 @@
 #include <QScrollArea>
 
 #include "netcom.h"
+#include "entity.h"
 
-class Macro;
 class MacroWindow;
-typedef QMap<QString, Macro> Macros;
-
 class MacroDrawer;
 
-class Macro {
+class Macro : public Entity {
 public:
-  Macro() {}
-  Macro(QDomNode &node, QScrollArea *scrollarea);
+  Macro(Entities &entities, NetCom &netcom, QString templ,
+        QScrollArea *scrollarea);
 
-  void init(QBoxLayout *layout, Macros &macros, bool initialising,
-            NetCom &netcom, QString templ);
+  const char *type();
 
   void update(QDomNode &node);
 
+  QWidget *widget();
+
+  bool isOpen();
+
   QString name;
   QString caption;
 
@@ -71,8 +72,10 @@ public:
   MacroDrawer *drawer;
 
 private:
-  QDomNode node;
   QScrollArea *scrollarea;
+  Entities &entities;
+  NetCom &netcom;
+  QString templ;
 };
 
 #endif/*__PRACRO_MACRO_H__*/