From 4be41d23fef29b2565b5daa62f81fa77a487352e Mon Sep 17 00:00:00 2001
From: Yury Melnichek <melnichek@gmail.com>
Date: Sat, 10 Sep 2011 14:18:40 +0200
Subject: [PATCH] Rename geometry/covering.hpp -> geometry/covering_utils.hpp.

---
 geometry/{covering.hpp => covering_utils.hpp} | 0
 geometry/geometry.pro                         | 2 +-
 geometry/geometry_tests/covering_test.cpp     | 2 +-
 indexer/cell_coverer.hpp                      | 2 +-
 indexer/feature_covering.cpp                  | 2 +-
 indexer/indexer_tests/cell_coverer_test.cpp   | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename geometry/{covering.hpp => covering_utils.hpp} (100%)

diff --git a/geometry/covering.hpp b/geometry/covering_utils.hpp
similarity index 100%
rename from geometry/covering.hpp
rename to geometry/covering_utils.hpp
diff --git a/geometry/geometry.pro b/geometry/geometry.pro
index fdadda4d56..27ebf4014e 100644
--- a/geometry/geometry.pro
+++ b/geometry/geometry.pro
@@ -25,7 +25,7 @@ HEADERS += \
   screenbase.hpp \
   cellid.hpp \
   rect_intersect.hpp \
-  covering.hpp \
+  covering_utils.hpp \
   packer.hpp \
   pointu_to_uint64.hpp \
   simplification.hpp \
diff --git a/geometry/geometry_tests/covering_test.cpp b/geometry/geometry_tests/covering_test.cpp
index d69e4899c6..e67fc6acfb 100644
--- a/geometry/geometry_tests/covering_test.cpp
+++ b/geometry/geometry_tests/covering_test.cpp
@@ -1,4 +1,4 @@
 #include "../../testing/testing.hpp"
-#include "../covering.hpp"
+#include "../covering_utils.hpp"
 
 // TODO: Add covering unit tests here.
diff --git a/indexer/cell_coverer.hpp b/indexer/cell_coverer.hpp
index 0d8aec8ef1..0bd59b5821 100644
--- a/indexer/cell_coverer.hpp
+++ b/indexer/cell_coverer.hpp
@@ -5,7 +5,7 @@
 #include "../std/queue.hpp"
 #include "../std/vector.hpp"
 
-// TODO: Move neccessary functions to geometry/covering.hpp and delete this file.
+// TODO: Move neccessary functions to geometry/covering_utils.hpp and delete this file.
 
 template <typename BoundsT, typename CellIdT>
 inline void SplitRectCell(CellIdT id,
diff --git a/indexer/feature_covering.cpp b/indexer/feature_covering.cpp
index e4a7571a71..564cac682e 100644
--- a/indexer/feature_covering.cpp
+++ b/indexer/feature_covering.cpp
@@ -2,7 +2,7 @@
 #include "cell_coverer.hpp"
 #include "cell_id.hpp"
 #include "feature.hpp"
-#include "../geometry/covering.hpp"
+#include "../geometry/covering_utils.hpp"
 #include "../base/base.hpp"
 #include "../base/stl_add.hpp"
 #include "../std/algorithm.hpp"
diff --git a/indexer/indexer_tests/cell_coverer_test.cpp b/indexer/indexer_tests/cell_coverer_test.cpp
index 94d2f98475..b47acc61ae 100644
--- a/indexer/indexer_tests/cell_coverer_test.cpp
+++ b/indexer/indexer_tests/cell_coverer_test.cpp
@@ -1,7 +1,7 @@
 #include "../cell_coverer.hpp"
 #include "../../testing/testing.hpp"
 
-#include "../../geometry/covering.hpp"
+#include "../../geometry/covering_utils.hpp"
 #include "../../coding/hex.hpp"
 #include "../../base/logging.hpp"