From 4e5db1af921b7071b51fbe898651f1aea7c4b165 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Wed, 6 Jan 2010 01:18:14 +0100
Subject: [PATCH] [Positioning] Fix #include and class declarations

Where possible, put the #include in the .cc file instead of the header
file.
Include <ostream> when <iostream> is not needed.

Fix a bug in operator<<() for Measurement: NULL value of ap and mobile
was not checked.
---
 owlps-positioning/accesspoint.hh            | 2 --
 owlps-positioning/area.hh                   | 2 +-
 owlps-positioning/building.cc               | 2 +-
 owlps-positioning/building.hh               | 3 ++-
 owlps-positioning/calibrationmeasurement.hh | 2 --
 owlps-positioning/measurement.cc            | 5 ++++-
 owlps-positioning/measurement.hh            | 5 ++---
 owlps-positioning/mobile.hh                 | 2 +-
 owlps-positioning/point3d.hh                | 2 +-
 owlps-positioning/referencepoint.hh         | 7 ++++---
 owlps-positioning/waypoint.hh               | 7 ++++---
 owlps-positioning/wifidevice.cc             | 1 -
 owlps-positioning/wifidevice.hh             | 3 ++-
 13 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/owlps-positioning/accesspoint.hh b/owlps-positioning/accesspoint.hh
index 4be1fb6..9fbb9d7 100644
--- a/owlps-positioning/accesspoint.hh
+++ b/owlps-positioning/accesspoint.hh
@@ -4,8 +4,6 @@
 #include "wifidevice.hh"
 #include "point3d.hh"
 
-#include <iostream>
-
 #define AP_DEFAULT_CHANNEL 6
 #define AP_DEFAULT_ANTENNA_GAIN 5
 
diff --git a/owlps-positioning/area.hh b/owlps-positioning/area.hh
index 0c9978e..5f5901f 100644
--- a/owlps-positioning/area.hh
+++ b/owlps-positioning/area.hh
@@ -5,8 +5,8 @@ class Building ;
 
 #include "point3d.hh"
 
-#include <iostream>
 #include <string>
+#include <ostream>
 
 class Area
 {
diff --git a/owlps-positioning/building.cc b/owlps-positioning/building.cc
index 6bb69a2..eb9f545 100644
--- a/owlps-positioning/building.cc
+++ b/owlps-positioning/building.cc
@@ -1,6 +1,6 @@
 #include "building.hh"
-#include "waypoint.hh"
 #include "area.hh"
+#include "waypoint.hh"
 
 
 using namespace std ;
diff --git a/owlps-positioning/building.hh b/owlps-positioning/building.hh
index 50a09c4..916e9f9 100644
--- a/owlps-positioning/building.hh
+++ b/owlps-positioning/building.hh
@@ -4,8 +4,9 @@
 class Area ;
 class Waypoint ;
 
-#include <iostream>
+#include <string>
 #include <vector>
+#include <ostream>
 
 class Building
 {
diff --git a/owlps-positioning/calibrationmeasurement.hh b/owlps-positioning/calibrationmeasurement.hh
index ebb4463..3f1ab7d 100644
--- a/owlps-positioning/calibrationmeasurement.hh
+++ b/owlps-positioning/calibrationmeasurement.hh
@@ -5,8 +5,6 @@ class ReferencePoint ;
 
 #include "measurement.hh"
 
-#include <iostream>
-
 class CalibrationMeasurement: public Measurement
 {
 protected:
diff --git a/owlps-positioning/measurement.cc b/owlps-positioning/measurement.cc
index 2069a02..3abb44a 100644
--- a/owlps-positioning/measurement.cc
+++ b/owlps-positioning/measurement.cc
@@ -96,7 +96,10 @@ bool Measurement::operator==(const Measurement &m)
 ostream &operator<<(ostream &os, const Measurement &m)
 {
   // MAC addresses
-  os << m.mobile->get_mac_addr() << "->" << m.ap->get_mac_addr() << ": " ;
+  os
+      << (m.mobile != NULL ? m.mobile->get_mac_addr() : "Unknown_mobile")
+      << "->" << (m.ap != NULL ? m.ap->get_mac_addr() : "Unknown_AP")
+      << ": " ;
 
   // List of SS
   if (m.ss_list.size() == 0)
diff --git a/owlps-positioning/measurement.hh b/owlps-positioning/measurement.hh
index 0373801..e5c0fef 100644
--- a/owlps-positioning/measurement.hh
+++ b/owlps-positioning/measurement.hh
@@ -4,10 +4,9 @@
 #include "mobile.hh"
 #include "accesspoint.hh"
 
-#include <iostream>
-#include <string>
 #include <vector>
-#include <math.h>
+#include <ostream>
+#include <cmath>
 
 class Measurement
 {
diff --git a/owlps-positioning/mobile.hh b/owlps-positioning/mobile.hh
index 4a641ba..3569fe1 100644
--- a/owlps-positioning/mobile.hh
+++ b/owlps-positioning/mobile.hh
@@ -3,7 +3,7 @@
 
 #include "wifidevice.hh"
 
-#include <iostream>
+#include <ostream>
 
 #define MOBILE_DEFAULT_ANTENNA_GAIN 2
 
diff --git a/owlps-positioning/point3d.hh b/owlps-positioning/point3d.hh
index d57bc91..4ec4a43 100644
--- a/owlps-positioning/point3d.hh
+++ b/owlps-positioning/point3d.hh
@@ -1,7 +1,7 @@
 #ifndef _OWLPS_POSITIONING_POINT3D_HH_
 #define _OWLPS_POSITIONING_POINT3D_HH_
 
-#include <iostream>
+#include <ostream>
 #include <cmath>
 
 class Point3D
diff --git a/owlps-positioning/referencepoint.hh b/owlps-positioning/referencepoint.hh
index 9623110..41b31fd 100644
--- a/owlps-positioning/referencepoint.hh
+++ b/owlps-positioning/referencepoint.hh
@@ -1,11 +1,12 @@
 #ifndef _OWLPS_POSITIONING_REFERENCEPOINT_HH_
 #define _OWLPS_POSITIONING_REFERENCEPOINT_HH_
 
-#include "point3d.hh"
-#include "calibrationmeasurement.hh"
+class CalibrationMeasurement ;
+
+#include "point3d.hh"
 
-#include <iostream>
 #include <vector>
+#include <ostream>
 
 class ReferencePoint: public Point3D
 {
diff --git a/owlps-positioning/waypoint.hh b/owlps-positioning/waypoint.hh
index aa25077..dcdba23 100644
--- a/owlps-positioning/waypoint.hh
+++ b/owlps-positioning/waypoint.hh
@@ -1,10 +1,11 @@
 #ifndef _OWLPS_POSITIONING_WAYPOINT_HH_
 #define _OWLPS_POSITIONING_WAYPOINT_HH_
 
-#include "point3d.hh"
-#include "building.hh"
+class Building ;
 
-#include <iostream>
+#include "point3d.hh"
+
+#include <ostream>
 #include <vector>
 #include <stdexcept>
 
diff --git a/owlps-positioning/wifidevice.cc b/owlps-positioning/wifidevice.cc
index af5295b..0143d7e 100644
--- a/owlps-positioning/wifidevice.cc
+++ b/owlps-positioning/wifidevice.cc
@@ -1,6 +1,5 @@
 #include "wifidevice.hh"
 
-
 using namespace std ;
 
 
diff --git a/owlps-positioning/wifidevice.hh b/owlps-positioning/wifidevice.hh
index 9ffe1c5..c75b646 100644
--- a/owlps-positioning/wifidevice.hh
+++ b/owlps-positioning/wifidevice.hh
@@ -3,7 +3,8 @@
 
 #include "posutil.hh"
 
-#include <iostream>
+#include <string>
+#include <ostream>
 
 #define WIFIDEVICE_DEFAULT_ANTENNA_GAIN 2
 #define WIFIDEVICE_DEFAULT_TRX_POWER 20 // 20 dBm = 100 mW