GetDevice() should be const.

2015-08-13 12:10:01 -07:00
parent d81c292aba
commit de61c2f689
24 changed files with 24 additions and 24 deletions
--- a/src/lr-wpan/model/lr-wpan-phy.cc
+++ b/src/lr-wpan/model/lr-wpan-phy.cc
@@ -194,7 +194,7 @@ LrWpanPhy::DoDispose (void)
 }

 Ptr<NetDevice>
-LrWpanPhy::GetDevice (void)
+LrWpanPhy::GetDevice (void) const
 {
  NS_LOG_FUNCTION (this);
  return m_device;
--- a/src/lr-wpan/model/lr-wpan-phy.h
+++ b/src/lr-wpan/model/lr-wpan-phy.h
@@ -272,7 +272,7 @@ public:
   */
  Ptr<SpectrumChannel> GetChannel (void);
  void SetDevice (Ptr<NetDevice> d);
-  Ptr<NetDevice> GetDevice (void);
+  Ptr<NetDevice> GetDevice (void) const;

  /**
   * Set the attached antenna.
--- a/src/lte/model/lte-phy.cc
+++ b/src/lte/model/lte-phy.cc
@@ -94,7 +94,7 @@ LtePhy::SetDevice (Ptr<LteNetDevice> d)


 Ptr<LteNetDevice>
-LtePhy::GetDevice ()
+LtePhy::GetDevice () const
 {
  NS_LOG_FUNCTION (this);
  return m_netDevice;
--- a/src/lte/model/lte-phy.h
+++ b/src/lte/model/lte-phy.h
@@ -78,7 +78,7 @@ public:
   * \brief Get the device where the phy layer is attached
   * \return the pointer to the device
   */
-  Ptr<LteNetDevice> GetDevice ();
+  Ptr<LteNetDevice> GetDevice () const;

  /** 
   * 
--- a/src/lte/model/lte-spectrum-phy.cc
+++ b/src/lte/model/lte-spectrum-phy.cc
@@ -238,7 +238,7 @@ LteSpectrumPhy::GetTypeId (void)


 Ptr<NetDevice>
-LteSpectrumPhy::GetDevice ()
+LteSpectrumPhy::GetDevice () const
 {
  NS_LOG_FUNCTION (this);
  return m_device;
--- a/src/lte/model/lte-spectrum-phy.h
+++ b/src/lte/model/lte-spectrum-phy.h
@@ -174,7 +174,7 @@ public:
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
-  Ptr<NetDevice> GetDevice ();
+  Ptr<NetDevice> GetDevice () const;
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  Ptr<AntennaModel> GetRxAntenna ();
  void StartRx (Ptr<SpectrumSignalParameters> params);
--- a/src/lte/model/rem-spectrum-phy.cc
+++ b/src/lte/model/rem-spectrum-phy.cc
@@ -103,7 +103,7 @@ RemSpectrumPhy::GetMobility ()
 }

 Ptr<NetDevice>
-RemSpectrumPhy::GetDevice ()
+RemSpectrumPhy::GetDevice () const
 {
  return 0;
 }
--- a/src/lte/model/rem-spectrum-phy.h
+++ b/src/lte/model/rem-spectrum-phy.h
@@ -64,7 +64,7 @@ public:
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
-  Ptr<NetDevice> GetDevice ();
+  Ptr<NetDevice> GetDevice () const;
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  Ptr<AntennaModel> GetRxAntenna ();
  void StartRx (Ptr<SpectrumSignalParameters> params);
--- a/src/lte/test/lte-simple-spectrum-phy.cc
+++ b/src/lte/test/lte-simple-spectrum-phy.cc
@@ -73,7 +73,7 @@ LteSimpleSpectrumPhy::GetTypeId (void)


 Ptr<NetDevice>
-LteSimpleSpectrumPhy::GetDevice ()
+LteSimpleSpectrumPhy::GetDevice () const
 {
  NS_LOG_FUNCTION (this);
  return m_device;
--- a/src/lte/test/lte-simple-spectrum-phy.h
+++ b/src/lte/test/lte-simple-spectrum-phy.h
@@ -60,7 +60,7 @@ public:
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
-  Ptr<NetDevice> GetDevice ();
+  Ptr<NetDevice> GetDevice () const;
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  Ptr<AntennaModel> GetRxAntenna ();
  void StartRx (Ptr<SpectrumSignalParameters> params);
--- a/src/spectrum/model/half-duplex-ideal-phy.cc
+++ b/src/spectrum/model/half-duplex-ideal-phy.cc
@@ -135,7 +135,7 @@ HalfDuplexIdealPhy::GetTypeId (void)


 Ptr<NetDevice>
-HalfDuplexIdealPhy::GetDevice ()
+HalfDuplexIdealPhy::GetDevice () const
 {
  NS_LOG_FUNCTION (this);
  return m_netDevice;
--- a/src/spectrum/model/half-duplex-ideal-phy.h
+++ b/src/spectrum/model/half-duplex-ideal-phy.h
@@ -98,7 +98,7 @@ public:
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
-  Ptr<NetDevice> GetDevice ();
+  Ptr<NetDevice> GetDevice () const;
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  Ptr<AntennaModel> GetRxAntenna ();
  void StartRx (Ptr<SpectrumSignalParameters> params);
--- a/src/spectrum/model/spectrum-analyzer.cc
+++ b/src/spectrum/model/spectrum-analyzer.cc
@@ -99,7 +99,7 @@ SpectrumAnalyzer::GetTypeId (void)


 Ptr<NetDevice>
-SpectrumAnalyzer::GetDevice ()
+SpectrumAnalyzer::GetDevice () const
 {
  return m_netDevice;
 }
--- a/src/spectrum/model/spectrum-analyzer.h
+++ b/src/spectrum/model/spectrum-analyzer.h
@@ -59,7 +59,7 @@ public:
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
-  Ptr<NetDevice> GetDevice ();
+  Ptr<NetDevice> GetDevice () const;
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  Ptr<AntennaModel> GetRxAntenna ();
  void StartRx (Ptr<SpectrumSignalParameters> params);
--- a/src/spectrum/model/spectrum-phy.h
+++ b/src/spectrum/model/spectrum-phy.h
@@ -63,7 +63,7 @@ public:
   *
   * @return a Ptr to the associated NetDevice instance
   */
-  virtual Ptr<NetDevice> GetDevice () = 0;
+  virtual Ptr<NetDevice> GetDevice () const = 0;

  /**
   * Set the mobility model associated with this device.
--- a/src/spectrum/model/tv-spectrum-transmitter.cc
+++ b/src/spectrum/model/tv-spectrum-transmitter.cc
@@ -151,7 +151,7 @@ TvSpectrumTransmitter::GetMobility ()
 }

 Ptr<NetDevice>
-TvSpectrumTransmitter::GetDevice ()
+TvSpectrumTransmitter::GetDevice () const
 {
  NS_LOG_FUNCTION (this);
  return m_netDevice;
--- a/src/spectrum/model/tv-spectrum-transmitter.h
+++ b/src/spectrum/model/tv-spectrum-transmitter.h
@@ -71,7 +71,7 @@ public:
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
-  Ptr<NetDevice> GetDevice ();
+  Ptr<NetDevice> GetDevice () const;
  // device does not use Rx but these pure virtual methods must be implemented
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  Ptr<AntennaModel> GetRxAntenna ();
--- a/src/spectrum/model/waveform-generator.cc
+++ b/src/spectrum/model/waveform-generator.cc
@@ -98,7 +98,7 @@ WaveformGenerator::GetTypeId (void)


 Ptr<NetDevice>
-WaveformGenerator::GetDevice ()
+WaveformGenerator::GetDevice () const
 {
  return m_netDevice;
 }
--- a/src/spectrum/model/waveform-generator.h
+++ b/src/spectrum/model/waveform-generator.h
@@ -64,7 +64,7 @@ public:
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
-  Ptr<NetDevice> GetDevice ();
+  Ptr<NetDevice> GetDevice () const;
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  Ptr<AntennaModel> GetRxAntenna ();
  void StartRx (Ptr<SpectrumSignalParameters> params);
--- a/src/uan/model/uan-phy-dual.cc
+++ b/src/uan/model/uan-phy-dual.cc
@@ -498,7 +498,7 @@ UanPhyDual::GetChannel (void) const
  return m_phy1->GetChannel ();
 }
 Ptr<UanNetDevice>
-UanPhyDual::GetDevice (void)
+UanPhyDual::GetDevice (void) const
 {
  return m_phy1->GetDevice ();
 }
--- a/src/uan/model/uan-phy-dual.h
+++ b/src/uan/model/uan-phy-dual.h
@@ -126,7 +126,7 @@ public:
  virtual bool IsStateTx (void);
  virtual bool IsStateCcaBusy (void);
  virtual Ptr<UanChannel> GetChannel (void) const;
-  virtual Ptr<UanNetDevice> GetDevice (void);
+  virtual Ptr<UanNetDevice> GetDevice (void) const;
  virtual void SetChannel (Ptr<UanChannel> channel);
  virtual void SetDevice (Ptr<UanNetDevice> device);
  virtual void SetMac (Ptr<UanMac> mac);
--- a/src/uan/model/uan-phy-gen.cc
+++ b/src/uan/model/uan-phy-gen.cc
@@ -809,7 +809,7 @@ UanPhyGen::GetChannel (void) const
 }

 Ptr<UanNetDevice>
-UanPhyGen::GetDevice (void)
+UanPhyGen::GetDevice (void) const
 {
  return m_device;
 }
--- a/src/uan/model/uan-phy-gen.h
+++ b/src/uan/model/uan-phy-gen.h
@@ -260,7 +260,7 @@ public:
  virtual double GetRxThresholdDb (void);
  virtual double GetCcaThresholdDb (void);
  virtual Ptr<UanChannel> GetChannel (void) const;
-  virtual Ptr<UanNetDevice> GetDevice (void);
+  virtual Ptr<UanNetDevice> GetDevice (void) const;
  virtual Ptr<UanTransducer> GetTransducer (void);
  virtual void SetChannel (Ptr<UanChannel> channel);
  virtual void SetDevice (Ptr<UanNetDevice> device);
--- a/src/uan/model/uan-phy.h
+++ b/src/uan/model/uan-phy.h
@@ -345,7 +345,7 @@ public:
   *
   * \return The net device.
   */
-  virtual Ptr<UanNetDevice> GetDevice (void) = 0;
+  virtual Ptr<UanNetDevice> GetDevice (void) const = 0;

  /**
   * Attach to a channel.