Skip to content

Commit 95e4a93

Browse files
kahrlkahrl
committedSep 10, 2013
Add license headers and remove useless includes
·
5.11.00.4.8
1 parent 3725179 commit 95e4a93

9 files changed

+178
-82
lines changed
 

‎src/database-dummy.cpp

+22-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
1+
/*
2+
Minetest
3+
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation; either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
19+
120
/*
221
Dummy "database" class
322
*/
423

524

25+
#include "database-dummy.h"
26+
627
#include "map.h"
728
#include "mapsector.h"
829
#include "mapblock.h"
30+
#include "serialization.h"
931
#include "main.h"
10-
#include "filesys.h"
11-
#include "voxel.h"
12-
#include "porting.h"
13-
#include "mapgen.h"
14-
#include "nodemetadata.h"
1532
#include "settings.h"
1633
#include "log.h"
17-
#include "profiler.h"
18-
#include "nodedef.h"
19-
#include "gamedef.h"
20-
#include "util/directiontables.h"
21-
#include "rollback_interface.h"
22-
23-
#include "database-dummy.h"
2434

2535
Database_Dummy::Database_Dummy(ServerMap *map)
2636
{

‎src/database-dummy.h

+23-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
1+
/*
2+
Minetest
3+
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation; either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
19+
120
#ifndef DATABASE_DUMMY_HEADER
221
#define DATABASE_DUMMY_HEADER
322

4-
#include "map.h"
5-
#include "mapsector.h"
6-
#include "mapblock.h"
7-
#include "main.h"
8-
#include "filesys.h"
923
#include "database.h"
24+
#include <map>
25+
#include <string>
26+
27+
class ServerMap;
1028

1129
class Database_Dummy : public Database
1230
{

‎src/database-leveldb.cpp

+23-13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
Minetest
3+
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation; either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
19+
120
#include "config.h"
221

322
#if USE_LEVELDB
@@ -6,25 +25,16 @@ LevelDB databases
625
*/
726

827

28+
#include "database-leveldb.h"
29+
#include "leveldb/db.h"
30+
931
#include "map.h"
1032
#include "mapsector.h"
1133
#include "mapblock.h"
34+
#include "serialization.h"
1235
#include "main.h"
13-
#include "filesys.h"
14-
#include "voxel.h"
15-
#include "porting.h"
16-
#include "mapgen.h"
17-
#include "nodemetadata.h"
1836
#include "settings.h"
1937
#include "log.h"
20-
#include "profiler.h"
21-
#include "nodedef.h"
22-
#include "gamedef.h"
23-
#include "util/directiontables.h"
24-
#include "rollback_interface.h"
25-
26-
#include "database-leveldb.h"
27-
#include "leveldb/db.h"
2838

2939
Database_LevelDB::Database_LevelDB(ServerMap *map, std::string savedir)
3040
{

‎src/database-leveldb.h

+25-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,34 @@
1-
#include "config.h"
1+
/*
2+
Minetest
3+
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation; either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
219

3-
#if USE_LEVELDB
420
#ifndef DATABASE_LEVELDB_HEADER
521
#define DATABASE_LEVELDB_HEADER
622

7-
#include "map.h"
8-
#include "mapsector.h"
9-
#include "mapblock.h"
10-
#include "main.h"
11-
#include "filesys.h"
12-
#include "database.h"
23+
#include "config.h"
24+
25+
#if USE_LEVELDB
1326

27+
#include "database.h"
1428
#include "leveldb/db.h"
29+
#include <string>
30+
31+
class ServerMap;
1532

1633
class Database_LevelDB : public Database
1734
{

‎src/database-sqlite3.cpp

+23-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
Minetest
3+
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation; either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
19+
120
/*
221
SQLite format specification:
322
- Initially only replaces sectors/ and sectors2/
@@ -15,24 +34,16 @@
1534
BLOB data
1635
*/
1736

37+
38+
#include "database-sqlite3.h"
39+
1840
#include "map.h"
1941
#include "mapsector.h"
2042
#include "mapblock.h"
43+
#include "serialization.h"
2144
#include "main.h"
22-
#include "filesys.h"
23-
#include "voxel.h"
24-
#include "porting.h"
25-
#include "mapgen.h"
26-
#include "nodemetadata.h"
2745
#include "settings.h"
2846
#include "log.h"
29-
#include "profiler.h"
30-
#include "nodedef.h"
31-
#include "gamedef.h"
32-
#include "util/directiontables.h"
33-
#include "rollback_interface.h"
34-
35-
#include "database-sqlite3.h"
3647

3748
Database_SQLite3::Database_SQLite3(ServerMap *map, std::string savedir)
3849
{

‎src/database-sqlite3.h

+22-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,34 @@
1+
/*
2+
Minetest
3+
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation; either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
19+
120
#ifndef DATABASE_SQLITE3_HEADER
221
#define DATABASE_SQLITE3_HEADER
322

4-
#include "config.h"
5-
#include "map.h"
6-
#include "mapsector.h"
7-
#include "mapblock.h"
8-
#include "main.h"
9-
#include "filesys.h"
1023
#include "database.h"
24+
#include <string>
1125

1226
extern "C" {
1327
#include "sqlite3.h"
1428
}
1529

30+
class ServerMap;
31+
1632
class Database_SQLite3 : public Database
1733
{
1834
public:

‎src/database.cpp

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
#include "map.h"
2-
#include "mapsector.h"
3-
#include "mapblock.h"
4-
#include "main.h"
5-
#include "filesys.h"
6-
#include "voxel.h"
7-
#include "porting.h"
8-
#include "mapgen.h"
9-
#include "nodemetadata.h"
10-
#include "settings.h"
11-
#include "log.h"
12-
#include "profiler.h"
13-
#include "nodedef.h"
14-
#include "gamedef.h"
15-
#include "util/directiontables.h"
16-
#include "rollback_interface.h"
1+
/*
2+
Minetest
3+
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
174
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation; either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
1819

1920
#include "database.h"
21+
#include "irrlichttypes.h"
2022

2123
static s32 unsignedToSigned(s32 i, s32 max_positive)
2224
{

‎src/database.h

+21-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
1+
/*
2+
Minetest
3+
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation; either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
19+
120
#ifndef DATABASE_HEADER
221
#define DATABASE_HEADER
322

4-
#include "config.h"
5-
#include "map.h"
6-
#include "mapsector.h"
7-
#include "mapblock.h"
8-
#include "main.h"
9-
#include "filesys.h"
10-
#include "serialization.h"
1123
#include <list>
24+
#include "irr_v3d.h"
1225

13-
class Database;
14-
class ServerMap;
26+
class MapBlock;
1527

1628
class Database
1729
{

‎src/map.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
3333
#include "modifiedstate.h"
3434
#include "util/container.h"
3535
#include "nodetimer.h"
36-
#include "database.h"
3736

37+
class Database;
3838
class ClientMap;
3939
class MapSector;
4040
class ServerMapSector;

0 commit comments

Comments
 (0)
Please sign in to comment.