Skip to content
This repository
Browse code

Renamed files to a c++ convention

  • Loading branch information...
commit a103f3304e5fcff2d45b6ddd8661c47e88a8572b 1 parent 87addce
John-John Tedro authored November 10, 2010

Showing 34 changed files with 58 additions and 57 deletions. Show diff stats Hide diff stats

  1. 3  CMakeLists.txt
  2. 0  src/2d/{cube.h → cube.hpp}
  3. 2  src/blocks.cpp
  4. 0  src/{blocks.h → blocks.hpp}
  5. 0  src/{cache.h → cache.hpp}
  6. 2  src/common.cpp
  7. 0  src/{common.h → common.hpp}
  8. 0  src/{config.h.cmake → config.hpp.cmake}
  9. 4  src/engine/engine_base.hpp
  10. 2  src/fileutils.cpp
  11. 0  src/{fileutils.h → fileutils.hpp}
  12. 2  src/{global.h → global.hpp}
  13. 2  src/image/image_base.hpp
  14. 2  src/json.cpp
  15. 2  src/{json.h → json.hpp}
  16. 10  src/level.cpp
  17. 10  src/{level.h → level.hpp}
  18. 32  src/main.cpp
  19. 2  src/{marker.h → marker.hpp}
  20. 2  src/nbt/nbt.cpp
  21. 0  src/nbt/{nbt.h → nbt.hpp}
  22. 2  src/nbt/nbt_inspect.cpp
  23. 2  src/players.cpp
  24. 4  src/{players.h → players.hpp}
  25. 2  src/text.cpp
  26. 2  src/{text.h → text.hpp}
  27. 0  src/threads/{threadworker.h → threadworker.hpp}
  28. 2  src/utf8.cpp
  29. 0  src/{utf8.h → utf8.hpp}
  30. 4  src/warps.cpp
  31. 4  src/{warps.h → warps.hpp}
  32. 2  src/world.cpp
  33. 8  src/{world.h → world.hpp}
  34. 6  test/test.cpp
3  CMakeLists.txt
@@ -8,7 +8,8 @@ set(C10T_VERSION "SNAPSHOT" CACHE STRING "C10t Version String")
8 8
 set(C10T_SITE "http://github.com/udoprog/c10t")
9 9
 set(C10T_CONTACT "Udoprog <johnjohn.tedro@gmail.com> et. al (see README)")
10 10
 
11  
-configure_file(${CMAKE_SOURCE_DIR}/src/config.h.cmake ${CMAKE_BINARY_DIR}/src/config.h)
  11
+configure_file(${CMAKE_SOURCE_DIR}/src/config.hpp.cmake
  12
+  ${CMAKE_BINARY_DIR}/src/config.hpp)
12 13
 include_directories(${CMAKE_BINARY_DIR}/src)
13 14
 
14 15
 # output the binary to the build directory instead of in src/
0  src/2d/cube.h → src/2d/cube.hpp
File renamed without changes
2  src/blocks.cpp
... ...
@@ -1,6 +1,6 @@
1 1
 // Distributed under the BSD License, see accompanying LICENSE.txt
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3  
-#include "blocks.h"
  3
+#include "blocks.hpp"
4 4
 
5 5
 const int mc::MapX = 0x10;
6 6
 const int mc::MapZ = 0x10;
0  src/blocks.h → src/blocks.hpp
File renamed without changes
0  src/cache.h → src/cache.hpp
File renamed without changes
2  src/common.cpp
... ...
@@ -1,6 +1,6 @@
1 1
 // Distributed under the BSD License, see accompanying LICENSE.txt
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3  
-#include "common.h"
  3
+#include "common.hpp"
4 4
 
5 5
 #include <sstream>
6 6
 #include <vector>
0  src/common.h → src/common.hpp
File renamed without changes
0  src/config.h.cmake → src/config.hpp.cmake
File renamed without changes
4  src/engine/engine_base.hpp
@@ -3,8 +3,8 @@
3 3
 
4 4
 #include <boost/shared_ptr.hpp>
5 5
 
6  
-#include "level.h"
7  
-#include "world.h"
  6
+#include "level.hpp"
  7
+#include "world.hpp"
8 8
 
9 9
 class engine_base {
10 10
   protected:
2  src/fileutils.cpp
... ...
@@ -1,5 +1,5 @@
1 1
 // Distributed under the BSD License, see accompanying LICENSE.txt
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3  
-#include "fileutils.h"
  3
+#include "fileutils.hpp"
4 4
 
5 5
 
0  src/fileutils.h → src/fileutils.hpp
File renamed without changes
2  src/global.h → src/global.hpp
@@ -12,7 +12,7 @@
12 12
 #include <string>
13 13
 #include <set>
14 14
 
15  
-#include "blocks.h"
  15
+#include "blocks.hpp"
16 16
 #include "image/color.hpp"
17 17
 
18 18
 namespace fs = boost::filesystem;
2  src/image/image_base.hpp
@@ -8,7 +8,7 @@
8 8
 
9 9
 #include "image/image_operations.hpp"
10 10
 #include "image/color.hpp"
11  
-#include "2d/cube.h"
  11
+#include "2d/cube.hpp"
12 12
 
13 13
 class image_base {
14 14
 protected:
2  src/json.cpp
... ...
@@ -1,4 +1,4 @@
1  
-#include "json.h"
  1
+#include "json.hpp"
2 2
 
3 3
 /*#include <iostream>
4 4
 
2  src/json.h → src/json.hpp
@@ -7,7 +7,7 @@
7 7
 
8 8
 #include <ostream>
9 9
 
10  
-#include "utf8.h"
  10
+#include "utf8.hpp"
11 11
 
12 12
 namespace json {
13 13
   enum object_type {
10  src/level.cpp
@@ -2,12 +2,12 @@
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3 3
 #include <assert.h>
4 4
 
5  
-#include "global.h"
  5
+#include "global.hpp"
6 6
 
7  
-#include "level.h"
8  
-#include "blocks.h"
9  
-#include "2d/cube.h"
10  
-#include "common.h"
  7
+#include "level.hpp"
  8
+#include "blocks.hpp"
  9
+#include "2d/cube.hpp"
  10
+#include "common.hpp"
11 11
 #include "algorithm.hpp"
12 12
 
13 13
 #include <boost/algorithm/string.hpp>
10  src/level.h → src/level.hpp
@@ -3,7 +3,7 @@
3 3
 #ifndef _LEVEL_H_
4 4
 #define _LEVEL_H_
5 5
 
6  
-#include "global.h"
  6
+#include "global.hpp"
7 7
 
8 8
 #include <iostream>
9 9
 #include <fstream>
@@ -16,11 +16,11 @@
16 16
 #include <time.h>
17 17
 #include <vector>
18 18
 
19  
-#include "nbt/nbt.h"
  19
+#include "nbt/nbt.hpp"
20 20
 
21  
-#include "global.h"
22  
-#include "blocks.h"
23  
-#include "marker.h"
  21
+#include "global.hpp"
  22
+#include "blocks.hpp"
  23
+#include "marker.hpp"
24 24
 
25 25
 #include <boost/filesystem.hpp>
26 26
 #include <boost/scoped_ptr.hpp>
32  src/main.cpp
@@ -21,22 +21,22 @@
21 21
 #include <boost/tokenizer.hpp>
22 22
 #include <boost/lexical_cast.hpp>
23 23
 
24  
-#include "config.h"
25  
-
26  
-#include "threads/threadworker.h"
27  
-#include "2d/cube.h"
28  
-
29  
-#include "global.h"
30  
-#include "level.h"
31  
-#include "cache.h"
32  
-#include "blocks.h"
33  
-#include "fileutils.h"
34  
-#include "world.h"
35  
-#include "players.h"
36  
-#include "text.h"
37  
-#include "marker.h"
38  
-#include "json.h"
39  
-#include "warps.h"
  24
+#include "config.hpp"
  25
+
  26
+#include "threads/threadworker.hpp"
  27
+#include "2d/cube.hpp"
  28
+
  29
+#include "global.hpp"
  30
+#include "level.hpp"
  31
+#include "cache.hpp"
  32
+#include "blocks.hpp"
  33
+#include "fileutils.hpp"
  34
+#include "world.hpp"
  35
+#include "players.hpp"
  36
+#include "text.hpp"
  37
+#include "marker.hpp"
  38
+#include "json.hpp"
  39
+#include "warps.hpp"
40 40
 
41 41
 #include "image/image_base.hpp"
42 42
 #include "image/memory_image.hpp"
2  src/marker.h → src/marker.hpp
@@ -3,7 +3,7 @@
3 3
 
4 4
 #include <string>
5 5
 
6  
-#include "text.h"
  6
+#include "text.hpp"
7 7
 
8 8
 struct marker {
9 9
 public:
2  src/nbt/nbt.cpp
... ...
@@ -1,6 +1,6 @@
1 1
 // Distributed under the BSD License, see accompanying LICENSE.txt
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3  
-#include "nbt.h"
  3
+#include "nbt.hpp"
4 4
 
5 5
 bool nbt::is_big_endian() {
6 6
   int32_t i = 1;
0  src/nbt/nbt.h → src/nbt/nbt.hpp
File renamed without changes
2  src/nbt/nbt_inspect.cpp
... ...
@@ -1,6 +1,6 @@
1 1
 // Distributed under the BSD License, see accompanying LICENSE.txt
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3  
-#include "nbt/nbt.h"
  3
+#include "nbt/nbt.hpp"
4 4
 
5 5
 #include <iostream>
6 6
 #include <iomanip>
2  src/players.cpp
... ...
@@ -1,6 +1,6 @@
1 1
 // Distributed under the BSD License, see accompanying LICENSE.txt
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3  
-#include "players.h"
  3
+#include "players.hpp"
4 4
 
5 5
 void error_handler(player *p, size_t where, const char* why) {
6 6
   p->grammar_error = true;
4  src/players.h → src/players.hpp
@@ -11,8 +11,8 @@
11 11
 #include <boost/filesystem/path.hpp>
12 12
 #include <boost/filesystem.hpp>
13 13
 
14  
-#include "global.h"
15  
-#include "nbt/nbt.h"
  14
+#include "global.hpp"
  15
+#include "nbt/nbt.hpp"
16 16
 
17 17
 namespace fs = boost::filesystem;
18 18
 
2  src/text.cpp
... ...
@@ -1,4 +1,4 @@
1 1
 // Distributed under the BSD License, see accompanying LICENSE.txt
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3  
-#include "text.h"
  3
+#include "text.hpp"
4 4
 
2  src/text.h → src/text.hpp
@@ -14,7 +14,7 @@
14 14
 namespace fs = boost::filesystem;
15 15
 
16 16
 #include "image/image_base.hpp"
17  
-#include "utf8.h"
  17
+#include "utf8.hpp"
18 18
 #include <assert.h>
19 19
 
20 20
 #include <iostream>
0  src/threads/threadworker.h → src/threads/threadworker.hpp
File renamed without changes
2  src/utf8.cpp
@@ -3,7 +3,7 @@
3 3
 * If you find it useful i would like to be given a notice as the original author.
4 4
 * Please contact me at: johnjohn.tedro@gmail.com
5 5
 */
6  
-#include "utf8.h"
  6
+#include "utf8.hpp"
7 7
 
8 8
 #include <stdlib.h>
9 9
 #include <stdio.h>
0  src/utf8.h → src/utf8.hpp
File renamed without changes
4  src/warps.cpp
... ...
@@ -1,4 +1,4 @@
1  
-#include "warps.h"
  1
+#include "warps.hpp"
2 2
 #include <iostream>
3 3
 #include <fstream>
4 4
 #include <boost/algorithm/string.hpp>
@@ -49,4 +49,4 @@ warps_db::warps_db(settings_t& s)
49 49
     warps.push_back(w);
50 50
   }
51 51
   fp.close();
52  
-}
  52
+}
4  src/warps.h → src/warps.hpp
@@ -9,8 +9,8 @@
9 9
 #include <boost/filesystem/path.hpp>
10 10
 #include <boost/filesystem.hpp>
11 11
 
12  
-#include "global.h"
13  
-#include "nbt/nbt.h"
  12
+#include "global.hpp"
  13
+#include "nbt/nbt.hpp"
14 14
 
15 15
 namespace fs = boost::filesystem;
16 16
 
2  src/world.cpp
... ...
@@ -1,6 +1,6 @@
1 1
 // Distributed under the BSD License, see accompanying LICENSE.txt
2 2
 // (C) Copyright 2010 John-John Tedro et al.
3  
-#include "world.h"
  3
+#include "world.hpp"
4 4
 
5 5
 void transform_world_xz(int& x, int& z, int rotation)
6 6
 {
8  src/world.h → src/world.hpp
@@ -15,10 +15,10 @@
15 15
 #include <boost/filesystem.hpp>
16 16
 #include <boost/ptr_container/ptr_map.hpp>
17 17
 
18  
-#include "fileutils.h"
19  
-#include "global.h"
20  
-#include "common.h"
21  
-#include "level.h"
  18
+#include "fileutils.hpp"
  19
+#include "global.hpp"
  20
+#include "common.hpp"
  21
+#include "level.hpp"
22 22
 
23 23
 namespace fs = boost::filesystem;
24 24
 
6  test/test.cpp
... ...
@@ -1,6 +1,6 @@
1  
-#include "color.h"
2  
-#include "image.h"
3  
-#include "2d/cube.h"
  1
+#include "color.hpp"
  2
+#include "image.hpp"
  3
+#include "2d/cube.hpp"
4 4
 
5 5
 #define BOOST_TEST_DYN_LINK
6 6
 #define BOOST_TEST_MODULE c10t_tests

0 notes on commit a103f33

Please sign in to comment.
Something went wrong with that request. Please try again.