From 9596c437646f369c3924dc78b20872762f3a47b9 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Mon, 21 Mar 2011 14:40:53 +0200 Subject: [PATCH 1/1] user_property.h moved to general include dir --- {projects/stargazer => include}/user_property.h | 0 projects/stargazer/plugins/authorization/ao/ao.cpp | 2 +- .../stargazer/plugins/authorization/inetaccess/inetaccess.cpp | 2 +- .../stargazer/plugins/configuration/rpcconfig/user_helper.cpp | 3 +-- .../plugins/configuration/rpcconfig/users_methods.cpp | 2 +- projects/stargazer/plugins/configuration/sgconfig/parser.cpp | 2 +- projects/stargazer/plugins/other/ping/ping.cpp | 2 +- projects/stargazer/plugins/other/radius/radius.cpp | 2 +- projects/stargazer/plugins/other/rscript/rscript.cpp | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) rename {projects/stargazer => include}/user_property.h (100%) diff --git a/projects/stargazer/user_property.h b/include/user_property.h similarity index 100% rename from projects/stargazer/user_property.h rename to include/user_property.h diff --git a/projects/stargazer/plugins/authorization/ao/ao.cpp b/projects/stargazer/plugins/authorization/ao/ao.cpp index b59bd58c..811807de 100644 --- a/projects/stargazer/plugins/authorization/ao/ao.cpp +++ b/projects/stargazer/plugins/authorization/ao/ao.cpp @@ -31,7 +31,7 @@ $Author: faust $ #include "ao.h" #include "user.h" #include "users.h" -#include "../../../user_property.h" +#include "user_property.h" #include "../../../eventloop.h" class AO_CREATOR diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp index b3d8823e..4e60829d 100644 --- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp +++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp @@ -41,8 +41,8 @@ #include "common.h" #include "stg_locker.h" #include "tariff.h" +#include "user_property.h" #include "../../../settings.h" -#include "../../../user_property.h" extern volatile const time_t stgTime; diff --git a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp index a557b677..30205c92 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp @@ -6,8 +6,7 @@ #include "user_ips.h" #include "utils.h" #include "common.h" - -#include "../../../user_property.h" +#include "user_property.h" //------------------------------------------------------------------------------ diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp index d16d883f..296a7c7b 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp @@ -5,13 +5,13 @@ #include "users.h" #include "admins.h" #include "tariffs.h" -#include "../../../user_property.h" #include "rpcconfig.h" #include "user_helper.h" #include "user_ips.h" #include "utils.h" #include "common.h" +#include "user_property.h" //------------------------------------------------------------------------------ diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp index b90cb2b6..8a01f169 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp @@ -12,8 +12,8 @@ #include "parser.h" #include "version.h" #include "tariffs.h" +#include "user_property.h" #include "../../../settings.h" -#include "../../../user_property.h" #define UNAME_LEN (256) //----------------------------------------------------------------------------- diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp index 3067e87e..169ac61d 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -7,8 +7,8 @@ #include "ping.h" #include "user.h" #include "stg_locker.h" +#include "user_property.h" #include "../../../settings.h" -#include "../../../user_property.h" class PING_CREATOR { diff --git a/projects/stargazer/plugins/other/radius/radius.cpp b/projects/stargazer/plugins/other/radius/radius.cpp index c3fb7183..a4eea3a8 100644 --- a/projects/stargazer/plugins/other/radius/radius.cpp +++ b/projects/stargazer/plugins/other/radius/radius.cpp @@ -34,7 +34,7 @@ #include "store.h" #include "common.h" #include "user_conf.h" -#include "../../../user_property.h" +#include "user_property.h" extern volatile const time_t stgTime; diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp index 1cc7883b..a772e507 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.cpp +++ b/projects/stargazer/plugins/other/rscript/rscript.cpp @@ -36,7 +36,7 @@ #include "ur_functor.h" #include "send_functor.h" #include "stg_locker.h" -#include "../../../user_property.h" +#include "user_property.h" extern volatile const time_t stgTime; -- 2.44.2