[libchamplainmm] defines: Cleanup



commit 9b95044eae587c27c9fd9cbf6dd0d7fb7dcf7f4a
Author: Juan R. GarcĂ­a Blanco <juanrgar gmail com>
Date:   Tue Feb 25 21:04:12 2014 +0100

    defines: Cleanup
    
        * Set type for latitude/longitude constants to double.
        * Remove State enum.

 libchamplain/src/defines.ccg |   10 ++++++----
 libchamplain/src/defines.hg  |   12 ++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/libchamplain/src/defines.ccg b/libchamplain/src/defines.ccg
index f82ece3..8f037fe 100644
--- a/libchamplain/src/defines.ccg
+++ b/libchamplain/src/defines.ccg
@@ -16,12 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <champlain/champlain.h>
+
 namespace Champlain
 {
 
-const int MIN_LATITUDE  = CHAMPLAIN_MIN_LATITUDE;
-const int MAX_LATITUDE  = CHAMPLAIN_MAX_LATITUDE;
-const int MIN_LONGITUDE = CHAMPLAIN_MIN_LONGITUDE;
-const int MAX_LONGITUDE = CHAMPLAIN_MAX_LONGITUDE;
+const double MIN_LATITUDE  = CHAMPLAIN_MIN_LATITUDE;
+const double MAX_LATITUDE  = CHAMPLAIN_MAX_LATITUDE;
+const double MIN_LONGITUDE = CHAMPLAIN_MIN_LONGITUDE;
+const double MAX_LONGITUDE = CHAMPLAIN_MAX_LONGITUDE;
 
 } // namespace Champlain
diff --git a/libchamplain/src/defines.hg b/libchamplain/src/defines.hg
index 6c5146e..59f1a10 100644
--- a/libchamplain/src/defines.hg
+++ b/libchamplain/src/defines.hg
@@ -18,16 +18,12 @@
 
 _DEFS(libchamplainmm,libchamplain)
 
-_CC_INCLUDE(champlain/champlain.h)
-
 namespace Champlain
 {
 
-_WRAP_ENUM(State, ChamplainState)
-
-extern const int MIN_LATITUDE;
-extern const int MAX_LATITUDE;
-extern const int MIN_LONGITUDE;
-extern const int MAX_LONGITUDE;
+extern const double MIN_LATITUDE;
+extern const double MAX_LATITUDE;
+extern const double MIN_LONGITUDE;
+extern const double MAX_LONGITUDE;
 
 } // namespace Champlain


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]