1 files changed, 16 insertions, 8 deletions

diff --git a/core/pim/datebook2/mainwindow.h b/core/pim/datebook2/mainwindow.h
index 60ea4c4..3c22637 100644
--- a/core/pim/datebook2/mainwindow.h
+++ b/core/pim/datebook2/mainwindow.h
@@ -9,2 +9,3 @@
 #include "locationmanager.h"
+#include "templatemanager.h"
 #include "view.h"
@@ -16,6 +17,5 @@ class QPEToolBar;
 namespace Datebook {
-
-    class TemplateManager;
     class BookManager;
     class Show;
+    class Editor;
     class MainWindow : public OPimMainWindow {
@@ -24,2 +24,3 @@ namespace Datebook {
         friend class View; // to avoid QObject
+        friend class Editor;
     public:
@@ -44,3 +45,6 @@ namespace Datebook {
         void slotConfigureDesc(); // Configure the Desc
+        void slotConfigureTemp();
+        void slotNewFromTemplate(int ); // called when someone chooses the template menu
 
+        void setTemplateMenu(); // updates the templateMenu
 
@@ -66,6 +70,9 @@ namespace Datebook {
         BookManager* manager();
-        TemplateManager* templateManager();
-        LocationManager* locationManager();
-        DescriptionManager* descriptionManager();
+        TemplateManager templateManager();
+        LocationManager locationManager();
+        DescriptionManager descriptionManager();
+        void setLocationManager( const LocationManager& );
+        void setDescriptionManager( const DescriptionManager& );
         Show* eventShow();
+        Editor* editor();
 
@@ -91,6 +98,7 @@ namespace Datebook {
         BookManager* m_manager;
-        TemplateManager* m_tempMan;
-        DescriptionManager* m_descMan;
-        LocationManager* m_locMan;
+        TemplateManager m_tempMan;
+        DescriptionManager m_descMan;
+        LocationManager m_locMan;
         Show* m_show;
+        Editor* m_edit;
     };