Merge branch 'naffanya-dev'

[stg.git] / projects / stargazer / plugin_runner.h

diff --git a/projects/stargazer/plugin_runner.h b/projects/stargazer/plugin_runner.h
index ba90306c6915d8e41546c5ea4d2ba770de559727..8e2272bfb1cf9ba84a9d08d3a4a8c1425c010310 100644 (file)
--- a/projects/stargazer/plugin_runner.h
+++ b/projects/stargazer/plugin_runner.h
@@ -29,14 +29,16 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "module_settings.h"
-#include "plugin.h"
-#include "os_int.h"
+#include "stg/module_settings.h"
+#include "stg/plugin.h"
+#include "stg/os_int.h"

 
 class SETTINGS_IMPL;
 class ADMINS_IMPL;
 class TARIFFS_IMPL;
 class USERS_IMPL;
 
 class SETTINGS_IMPL;
 class ADMINS_IMPL;
 class TARIFFS_IMPL;
 class USERS_IMPL;

+class SERVICES_IMPL;
+class CORPORATIONS_IMPL;

 class TRAFFCOUNTER;
 class STORE;
 
 class TRAFFCOUNTER;
 class STORE;
 


@@ -48,6 +50,8 @@ public:
                   ADMINS_IMPL * admins,
                   TARIFFS_IMPL * tariffs,
                   USERS_IMPL * users,
                   ADMINS_IMPL * admins,
                   TARIFFS_IMPL * tariffs,
                   USERS_IMPL * users,

+                  SERVICES_IMPL * services,
+                  CORPORATIONS_IMPL * corporations,

                   TRAFFCOUNTER * tc,
                   STORE * store,
                   const SETTINGS_IMPL * s);
                   TRAFFCOUNTER * tc,
                   STORE * store,
                   const SETTINGS_IMPL * s);


@@ -86,6 +90,8 @@ private:
     ADMINS_IMPL *   admins;
     TARIFFS_IMPL *  tariffs;
     USERS_IMPL *    users;
     ADMINS_IMPL *   admins;
     TARIFFS_IMPL *  tariffs;
     USERS_IMPL *    users;

+    SERVICES_IMPL * services;
+    CORPORATIONS_IMPL * corps;

     STORE *         store;
     TRAFFCOUNTER *  traffCnt;
     const SETTINGS_IMPL * stgSettings;
     STORE *         store;
     TRAFFCOUNTER *  traffCnt;
     const SETTINGS_IMPL * stgSettings;