From 175719db6d842ef6b88f9637f8ae31871d67df32 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Fri, 5 Mar 2010 10:05:12 +0100
Subject: [PATCH] [Positioning] PosUtil: channel defs -> posutil.cc

Move channels defines into posutil.cc.
Remove some useless includes in PosUtil and InputCSV.
---
 owlps-positioning/TODO            |  3 ---
 owlps-positioning/src/inputcsv.cc |  2 --
 owlps-positioning/src/posutil.cc  | 18 ++++++++++++++++++
 owlps-positioning/src/posutil.hh  | 19 -------------------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/owlps-positioning/TODO b/owlps-positioning/TODO
index be009b9..5f5d1ad 100644
--- a/owlps-positioning/TODO
+++ b/owlps-positioning/TODO
@@ -4,9 +4,6 @@
    ° Finir le test de Output.
    ° Finir le test de Positioning.
 
-- PosUtil
-   ° Déplacer les #define des canaux Wi-Fi dans le .cc
-
 - Revoir le diagramme UML
    ° Associations : devraient êtres représentées par des attributs
    pointeurs.
diff --git a/owlps-positioning/src/inputcsv.cc b/owlps-positioning/src/inputcsv.cc
index da0aef3..0f91878 100644
--- a/owlps-positioning/src/inputcsv.cc
+++ b/owlps-positioning/src/inputcsv.cc
@@ -4,8 +4,6 @@
 #include "stock.hh"
 #include "calibrationrequest.hh"
 
-#include <stdint.h>
-
 #include <iostream>
 #include <boost/tr1/unordered_map.hpp>
 
diff --git a/owlps-positioning/src/posutil.cc b/owlps-positioning/src/posutil.cc
index 8cc0acd..674b04b 100644
--- a/owlps-positioning/src/posutil.cc
+++ b/owlps-positioning/src/posutil.cc
@@ -2,6 +2,24 @@
 
 
 
+/* Wi-Fi channel frequencies in Hz */
+#define CHANNEL_1  2412
+#define CHANNEL_2  2417
+#define CHANNEL_3  2422
+#define CHANNEL_4  2427
+#define CHANNEL_5  2432
+#define CHANNEL_6  2437
+#define CHANNEL_7  2442
+#define CHANNEL_8  2447
+#define CHANNEL_9  2452
+#define CHANNEL_10 2457
+#define CHANNEL_11 2462
+#define CHANNEL_12 2467
+#define CHANNEL_13 2472
+#define CHANNEL_14 2477
+
+
+
 /**
  * @param channel A IEEE 802.11 channel.
  * @return The frequency in Hz or 0 if the channel is wrong.
diff --git a/owlps-positioning/src/posutil.hh b/owlps-positioning/src/posutil.hh
index 03699b6..d077f95 100644
--- a/owlps-positioning/src/posutil.hh
+++ b/owlps-positioning/src/posutil.hh
@@ -1,25 +1,6 @@
 #ifndef _OWLPS_POSITIONING_POSUTIL_HH_
 #define _OWLPS_POSITIONING_POSUTIL_HH_
 
-#include <ctime>
-#include <stdint.h> // <cstdint> is not C++ 98 compliant
-
-/* Wi-Fi channel frequencies in Hz */
-#define CHANNEL_1  2412
-#define CHANNEL_2  2417
-#define CHANNEL_3  2422
-#define CHANNEL_4  2427
-#define CHANNEL_5  2432
-#define CHANNEL_6  2437
-#define CHANNEL_7  2442
-#define CHANNEL_8  2447
-#define CHANNEL_9  2452
-#define CHANNEL_10 2457
-#define CHANNEL_11 2462
-#define CHANNEL_12 2467
-#define CHANNEL_13 2472
-#define CHANNEL_14 2477
-
 /// Utilitary class
 class PosUtil
 {