From: Maxim Mamontov Date: Mon, 5 Aug 2013 17:45:43 +0000 (+0300) Subject: Re-organized includes. X-Git-Tag: 2.409~340 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/b2feeb7214b97678c52075570e40e52828914a82?hp=393d6e8e0a108dbca6a0ef2dde96f23be2ce2987 Re-organized includes. --- diff --git a/include/stg/user.h b/include/stg/user.h index 1fa49201..44d3e5b2 100644 --- a/include/stg/user.h +++ b/include/stg/user.h @@ -21,17 +21,16 @@ #ifndef USER_H #define USER_H -#include -#include - -#include -#include - -#include "os_int.h" #include "notifer.h" #include "message.h" #include "tariff.h" #include "user_traff.h" +#include "os_int.h" + +#include +#include + +#include class USER_PROPERTIES; class AUTH; diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index f6bf0070..4f216b06 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -32,14 +32,9 @@ #define _GNU_SOURCE #endif -#include -#include // access - -#include -#include -#include -#include -#include +#include "user_impl.h" +#include "settings_impl.h" +#include "stg_timer.h" #include "stg/users.h" #include "stg/common.h" @@ -47,9 +42,16 @@ #include "stg/tariff.h" #include "stg/tariffs.h" #include "stg/admin.h" -#include "user_impl.h" -#include "settings_impl.h" -#include "stg_timer.h" + +#include +#include + +#include +#include +#include + +#include +#include // access #ifdef USE_ABSTRACT_SETTINGS USER_IMPL::USER_IMPL(const SETTINGS * s, diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h index 412816c3..96317f06 100644 --- a/projects/stargazer/user_impl.h +++ b/projects/stargazer/user_impl.h @@ -27,15 +27,7 @@ #ifndef USER_IMPL_H #define USER_IMPL_H -#include -#include -#include -#include -#include - #include "stg/user.h" -#include "stg/os_int.h" -#include "stg/const.h" #include "stg/user_stat.h" #include "stg/user_conf.h" #include "stg/user_ips.h" @@ -43,6 +35,15 @@ #include "stg/auth.h" #include "stg/message.h" #include "stg/noncopyable.h" +#include "stg/os_int.h" +#include "stg/const.h" + +#include +#include +#include +#include + +#include //----------------------------------------------------------------------------- class TARIFF;