all: Merged duplicate refreshDisplay() methods created by previous patches.

The end result is that all display string related code is put into refreshDisplay()
and it's not called directly from model code.

Author: levy

src/inet/clock/base/ClockBase.cc

@@ -43,10 +43,6 @@ void ClockBase::finish()
     emit(timeChangedSignal, getClockTime().asSimTime());
 }
 
-void ClockBase::refreshDisplay() const
-{
-}
-
 void ClockBase::refreshDisplay() const
 {
     if (getEnvir()->isGUI()) {

src/inet/clock/base/ClockBase.h

@@ -35,7 +35,6 @@ class INET_API ClockBase : public cSimpleModule, public IClock, public StringFor
     virtual void handleMessage(cMessage *msg) override;
     virtual void finish() override;
     virtual void refreshDisplay() const override;
-    virtual void refreshDisplay() const;
 
     cSimpleModule *getTargetModule() const {
         cSimpleModule *target = getSimulation()->getContextSimpleModule();

src/inet/clock/base/OscillatorBase.h

@@ -24,7 +24,7 @@ class INET_API OscillatorBase : public cSimpleModule, public IOscillator, public
   protected:
     virtual int numInitStages() const override { return NUM_INIT_STAGES; }
     virtual void initialize(int stage) override;
-    virtual void refreshDisplay() const;
+    virtual void refreshDisplay() const override;
 
   public:
     virtual std::string resolveDirective(char directive) const override;

src/inet/common/packet/recorder/PcapRecorder.cc

@@ -157,10 +157,6 @@ void PcapRecorder::handleMessage(cMessage *msg)
     throw cRuntimeError("This module does not handle messages");
 }
 
-void PcapRecorder::refreshDisplay() const
-{
-}
-
 std::string PcapRecorder::resolveDirective(char directive) const
 {
     switch (directive) {

src/inet/common/packet/recorder/PcapRecorder.h

@@ -74,7 +74,6 @@ class INET_API PcapRecorder : public cSimpleModule, protected cListener, public
     virtual void initialize() override;
     virtual void handleMessage(cMessage *msg) override;
     virtual void refreshDisplay() const override;
-    virtual void refreshDisplay() const;
     virtual void finish() override;
     virtual void receiveSignal(cComponent *source, simsignal_t signalID, cObject *obj, cObject *details) override;
     virtual void recordPacket(const cPacket *msg, Direction direction, cComponent *source);

src/inet/linklayer/base/MacRelayUnitBase.h

@@ -30,7 +30,7 @@ class INET_API MacRelayUnitBase : public LayeredProtocolBase, public StringForma
   protected:
     virtual void initialize(int stage) override;
     virtual void finish() override;
-    virtual void refreshDisplay() const;
+    virtual void refreshDisplay() const override;
     virtual std::string resolveDirective(char directive) const override;
 
     virtual bool isForwardingInterface(NetworkInterface *networkInterface) const { return !networkInterface->isLoopback() && networkInterface->isBroadcast(); }

src/inet/linklayer/ethernet/common/MacForwardingTable.cc

@@ -103,10 +103,6 @@ void MacForwardingTable::handleMessageWhenUp(cMessage *)
     throw cRuntimeError("This module doesn't process messages");
 }
 
-void MacForwardingTable::refreshDisplay() const
-{
-}
-
 void MacForwardingTable::refreshDisplay() const
 {
     if (getEnvir()->isGUI()) {

src/inet/linklayer/ethernet/common/MacForwardingTable.h

@@ -65,7 +65,6 @@ class INET_API MacForwardingTable : public OperationalBase, public IMacForwardin
     virtual void handleMessage(cMessage *msg) override;
     virtual void handleMessageWhenUp(cMessage *msg) override;
     virtual void refreshDisplay() const override;
-    virtual void refreshDisplay() const;
     virtual std::string resolveDirective(char directive) const override;
 
     virtual void parseForwardingTableParameter();

src/inet/linklayer/ieee80211/mac/coordinationfunction/Dcf.h

@@ -87,7 +87,7 @@ class INET_API Dcf : public ICoordinationFunction, public IFrameSequenceHandler:
     virtual void initialize(int stage) override;
     virtual void forEachChild(cVisitor *v) override;
     virtual void handleMessage(cMessage *msg) override;
-    virtual void refreshDisplay() const;
+    virtual void refreshDisplay() const override;
 
     virtual void sendUp(const std::vector<Packet *>& completeFrames);
     virtual bool hasFrameToTransmit();

src/inet/linklayer/ieee80211/mac/coordinationfunction/Hcf.h

@@ -107,7 +107,7 @@ class INET_API Hcf : public ICoordinationFunction, public IFrameSequenceHandler:
     virtual void initialize(int stage) override;
     virtual void forEachChild(cVisitor *v) override;
     virtual void handleMessage(cMessage *msg) override;
-    virtual void refreshDisplay() const;
+    virtual void refreshDisplay() const override;
 
     void startFrameSequence(AccessCategory ac);
     void handleInternalCollision(std::vector<Edcaf *> internallyCollidedEdcafs);

src/inet/linklayer/ieee80211/mac/queue/InProgressFrames.h

@@ -32,7 +32,7 @@ class INET_API InProgressFrames : public cSimpleModule
 
   protected:
     virtual void initialize(int stage) override;
-    virtual void refreshDisplay() const;
+    virtual void refreshDisplay() const override;
 
     void ensureHasFrameToTransmit();
     bool hasEligibleFrameToTransmit();

src/inet/linklayer/ieee80211/mac/ratecontrol/AarfRateControl.h

@@ -38,7 +38,7 @@ class INET_API AarfRateControl : public RateControlBase
     virtual void resetIncreaseThreshdold();
     virtual void resetTimer();
     virtual void increaseRateIfTimerIsExpired();
-    virtual void refreshDisplay() const;
+    virtual void refreshDisplay() const override;
 
   public:
     virtual const physicallayer::IIeee80211Mode *getRate() override;

src/inet/linklayer/ieee80211/mac/ratecontrol/OnoeRateControl.h

@@ -37,7 +37,7 @@ class INET_API OnoeRateControl : public RateControlBase
     virtual void computeMode();
     virtual void resetStatisticalVariables();
     virtual void computeModeIfTimerIsExpired();
-    virtual void refreshDisplay() const;
+    virtual void refreshDisplay() const override;
 
   public:
     virtual const physicallayer::IIeee80211Mode *getRate() override;

src/inet/linklayer/mrp/Mrp.cc

@@ -1983,10 +1983,6 @@ void Mrp::refreshDisplay() const
             }
         }
     }
-}
-
-void Mrp::refreshDisplay() const
-{
     if (getEnvir()->isGUI()) {
         auto text = StringFormat::formatString(par("displayStringTextFormat"), this);
         getDisplayString().setTagArg("t", 0, text.c_str());

src/inet/linklayer/mrp/Mrp.h

@@ -225,7 +225,6 @@ class INET_API Mrp: public OperationalBase, public cListener, public StringForma
     virtual void clearFDB(simtime_t time);
     virtual void colorLink(NetworkInterface* ie, bool forwarding) const;
     virtual void refreshDisplay() const override;
-    virtual void refreshDisplay() const;
     virtual std::string resolveDirective(char directive) const override;
     static const char *getMrpRoleName(MrpRole role, bool acronym);
     static const char *getNodeStateName(NodeState state);

src/inet/networklayer/common/NetworkInterface.cc

@@ -277,10 +277,6 @@ void NetworkInterface::pushPacketEnd(Packet *packet, const cGate *gate)
         throw cRuntimeError("Unknown gate: %s", gate->getName());
 }
 
-void NetworkInterface::refreshDisplay() const
-{
-}
-
 void NetworkInterface::refreshDisplay() const
 {
     if (getEnvir()->isGUI()) {

src/inet/networklayer/common/NetworkInterface.h

@@ -165,7 +165,6 @@ class INET_API NetworkInterface : public queueing::PacketProcessorBase, public q
     virtual void initialize(int stage) override;
     virtual void handleParameterChange(const char *name) override;
     virtual void refreshDisplay() const override;
-    virtual void refreshDisplay() const override;
     virtual std::string resolveDirective(char directive) const override;
     virtual void receiveSignal(cComponent *source, simsignal_t signal, cObject *obj, cObject *details) override;
     virtual cGate *createGateObject(cGate::Type type) override {

src/inet/networklayer/ipv4/Ipv4NetworkLayer.cc

@@ -13,10 +13,6 @@ namespace inet {
 
 Define_Module(Ipv4NetworkLayer);
 
-void Ipv4NetworkLayer::refreshDisplay() const
-{
-}
-
 void Ipv4NetworkLayer::refreshDisplay() const
 {
     if (getEnvir()->isGUI()) {

src/inet/networklayer/ipv4/Ipv4NetworkLayer.h

@@ -17,7 +17,6 @@ class INET_API Ipv4NetworkLayer : public cModule, public StringFormat::IDirectiv
 {
   protected:
     virtual void refreshDisplay() const override;
-    virtual void refreshDisplay() const;
     virtual std::string resolveDirective(char directive) const override;
 };
 

src/inet/power/storage/SimpleCcBattery.cc

@@ -34,10 +34,6 @@ void SimpleCcBattery::initialize(int stage)
     }
 }
 
-void SimpleCcBattery::refreshDisplay() const
-{
-}
-
 void SimpleCcBattery::refreshDisplay() const
 {
     if (getEnvir()->isGUI()) {

src/inet/power/storage/SimpleCcBattery.h

@@ -36,7 +36,6 @@ class INET_API SimpleCcBattery : public CcEnergyStorageBase, public StringFormat
   protected:
     virtual void initialize(int stage) override;
     virtual void refreshDisplay() const override;
-    virtual void refreshDisplay() const;
     virtual std::string resolveDirective(char directive) const override;
 
     virtual void updateTotalCurrentConsumption() override;

src/inet/power/storage/SimpleEpEnergyStorage.cc

@@ -52,10 +52,6 @@ void SimpleEpEnergyStorage::handleMessage(cMessage *message)
         throw cRuntimeError("Unknown message");
 }
 
-void SimpleEpEnergyStorage::refreshDisplay() const
-{
-}
-
 void SimpleEpEnergyStorage::refreshDisplay() const
 {
     if (getEnvir()->isGUI()) {

src/inet/power/storage/SimpleEpEnergyStorage.h

@@ -77,7 +77,6 @@ class INET_API SimpleEpEnergyStorage : public EpEnergyStorageBase, public String
     virtual void initialize(int stage) override;
     virtual void handleMessage(cMessage *message) override;
     virtual void refreshDisplay() const override;
-    virtual void refreshDisplay() const;
     virtual std::string resolveDirective(char directive) const override;
 
     virtual void updateTotalPowerConsumption() override;

src/inet/queueing/base/PacketProcessorBase.cc

@@ -26,6 +26,10 @@ void PacketProcessorBase::initialize(int stage)
 
 void PacketProcessorBase::refreshDisplay() const
 {
+    if (getEnvir()->isGUI() && displayStringTextFormat != nullptr) {
+        auto text = StringFormat::formatString(displayStringTextFormat, this);
+        getDisplayString().setTagArg("t", 0, text.c_str());
+    }
 }
 
 void PacketProcessorBase::handlePacketProcessed(Packet *packet)
@@ -398,14 +402,6 @@ void PacketProcessorBase::dropPacket(Packet *packet, PacketDropReason reason, in
     delete packet;
 }
 
-void PacketProcessorBase::refreshDisplay() const
-{
-    if (getEnvir()->isGUI() && displayStringTextFormat != nullptr) {
-        auto text = StringFormat::formatString(displayStringTextFormat, this);
-        getDisplayString().setTagArg("t", 0, text.c_str());
-    }
-}
-
 std::string PacketProcessorBase::resolveDirective(char directive) const
 {
     switch (directive) {

src/inet/queueing/base/PacketProcessorBase.h

@@ -73,8 +73,6 @@ class INET_API PacketProcessorBase : public cSimpleModule, public virtual IPacke
 
     virtual void dropPacket(Packet *packet, PacketDropReason reason, int limit = -1);
 
-    virtual void refreshDisplay() const;
-
   public:
     virtual bool supportsPacketSending(const cGate *gate) const override { return true; }
     virtual bool supportsPacketPassing(const cGate *gate) const override { return true; }