diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
commit | ad6bc13dc2b70741ee3f006e321ba46dd421b9b5 (patch) | |
tree | 72540c0d47f5501f6080f7b03de600daed0a029a /src/common/profile.h | |
parent | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (diff) | |
parent | 94e7fd920353c39471d8836a8bf87ffb113f1349 (diff) | |
download | colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.gz colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.bz2 colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.zip |
Merge dev-common and various fixes to achieve compilation
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
Diffstat (limited to 'src/common/profile.h')
-rw-r--r-- | src/common/profile.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/common/profile.h b/src/common/profile.h index 0886522..7a23d94 100644 --- a/src/common/profile.h +++ b/src/common/profile.h @@ -14,22 +14,19 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -// profile.h +/** + * \file common/profile.h + * \brief Class for loading profile (currently for loading ini config file) + */ #pragma once -#include <cstdlib> -#include <vector> -#include <utility> - -#include <lib/simpleini/SimpleIni.h> +#include "lib/simpleini/SimpleIni.h" -#include <common/singleton.h> +#include "common/singleton.h" -/** - * @file common/profile.h - * @brief Class for loading profile (currently for loading ini config file) - */ +#include <string> +#include <vector> /** |