Skip to content

Commit fe6f6a9

Browse files
levylevy
committed
all: Renamed all updateDisplayString() methods to refreshDisplay().
There's no need to have a separate one when they are so simple.
1 parent e3d5854 commit fe6f6a9

34 files changed

+35
-35
lines changed

‎src/inet/clock/base/ClockBase.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void ClockBase::refreshDisplay() const
4747
{
4848
}
4949

50-
void ClockBase::updateDisplayString() const
50+
void ClockBase::refreshDisplay() const
5151
{
5252
if (getEnvir()->isGUI()) {
5353
auto text = StringFormat::formatString(displayStringTextFormat, this);

‎src/inet/clock/base/ClockBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class INET_API ClockBase : public cSimpleModule, public IClock, public StringFor
3535
virtual void handleMessage(cMessage *msg) override;
3636
virtual void finish() override;
3737
virtual void refreshDisplay() const override;
38-
virtual void updateDisplayString() const;
38+
virtual void refreshDisplay() const;
3939

4040
cSimpleModule *getTargetModule() const {
4141
cSimpleModule *target = getSimulation()->getContextSimpleModule();

‎src/inet/clock/base/OscillatorBase.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void OscillatorBase::initialize(int stage)
1717
displayStringTextFormat = par("displayStringTextFormat");
1818
}
1919

20-
void OscillatorBase::updateDisplayString() const
20+
void OscillatorBase::refreshDisplay() const
2121
{
2222
if (getEnvir()->isGUI()) {
2323
auto text = StringFormat::formatString(displayStringTextFormat, this);

‎src/inet/clock/base/OscillatorBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class INET_API OscillatorBase : public cSimpleModule, public IOscillator, public
2424
protected:
2525
virtual int numInitStages() const override { return NUM_INIT_STAGES; }
2626
virtual void initialize(int stage) override;
27-
virtual void updateDisplayString() const;
27+
virtual void refreshDisplay() const;
2828

2929
public:
3030
virtual std::string resolveDirective(char directive) const override;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ std::string PcapRecorder::resolveDirective(char directive) const
171171
}
172172
}
173173

174-
void PcapRecorder::updateDisplayString() const
174+
void PcapRecorder::refreshDisplay() const
175175
{
176176
if (getEnvir()->isGUI()) {
177177
auto text = StringFormat::formatString(par("displayStringTextFormat"), this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class INET_API PcapRecorder : public cSimpleModule, protected cListener, public
7474
virtual void initialize() override;
7575
virtual void handleMessage(cMessage *msg) override;
7676
virtual void refreshDisplay() const override;
77-
virtual void updateDisplayString() const;
77+
virtual void refreshDisplay() const;
7878
virtual void finish() override;
7979
virtual void receiveSignal(cComponent *source, simsignal_t signalID, cObject *obj, cObject *details) override;
8080
virtual void recordPacket(const cPacket *msg, Direction direction, cComponent *source);

‎src/inet/linklayer/base/MacRelayUnitBase.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ std::string MacRelayUnitBase::resolveDirective(char directive) const
4646
}
4747
}
4848

49-
void MacRelayUnitBase::updateDisplayString() const
49+
void MacRelayUnitBase::refreshDisplay() const
5050
{
5151
if (getEnvir()->isGUI()) {
5252
auto text = StringFormat::formatString(par("displayStringTextFormat"), this);

‎src/inet/linklayer/base/MacRelayUnitBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class INET_API MacRelayUnitBase : public LayeredProtocolBase, public StringForma
3030
protected:
3131
virtual void initialize(int stage) override;
3232
virtual void finish() override;
33-
virtual void updateDisplayString() const;
33+
virtual void refreshDisplay() const;
3434
virtual std::string resolveDirective(char directive) const override;
3535

3636
virtual bool isForwardingInterface(NetworkInterface *networkInterface) const { return !networkInterface->isLoopback() && networkInterface->isBroadcast(); }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void MacForwardingTable::refreshDisplay() const
107107
{
108108
}
109109

110-
void MacForwardingTable::updateDisplayString() const
110+
void MacForwardingTable::refreshDisplay() const
111111
{
112112
if (getEnvir()->isGUI()) {
113113
auto text = StringFormat::formatString(par("displayStringTextFormat"), this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class INET_API MacForwardingTable : public OperationalBase, public IMacForwardin
6565
virtual void handleMessage(cMessage *msg) override;
6666
virtual void handleMessageWhenUp(cMessage *msg) override;
6767
virtual void refreshDisplay() const override;
68-
virtual void updateDisplayString() const;
68+
virtual void refreshDisplay() const;
6969
virtual std::string resolveDirective(char directive) const override;
7070

7171
virtual void parseForwardingTableParameter();

‎src/inet/linklayer/ieee80211/mac/coordinationfunction/Dcf.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void Dcf::handleMessage(cMessage *msg)
6666
throw cRuntimeError("Unknown msg type");
6767
}
6868

69-
void Dcf::updateDisplayString() const
69+
void Dcf::refreshDisplay() const
7070
{
7171
if (frameSequenceHandler->isSequenceRunning()) {
7272
auto history = frameSequenceHandler->getFrameSequence()->getHistory();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class INET_API Dcf : public ICoordinationFunction, public IFrameSequenceHandler:
8787
virtual void initialize(int stage) override;
8888
virtual void forEachChild(cVisitor *v) override;
8989
virtual void handleMessage(cMessage *msg) override;
90-
virtual void updateDisplayString() const;
90+
virtual void refreshDisplay() const;
9191

9292
virtual void sendUp(const std::vector<Packet *>& completeFrames);
9393
virtual bool hasFrameToTransmit();

‎src/inet/linklayer/ieee80211/mac/coordinationfunction/Hcf.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void Hcf::handleMessage(cMessage *msg)
8888
throw cRuntimeError("Unknown msg type");
8989
}
9090

91-
void Hcf::updateDisplayString() const
91+
void Hcf::refreshDisplay() const
9292
{
9393
if (frameSequenceHandler->isSequenceRunning()) {
9494
auto history = frameSequenceHandler->getFrameSequence()->getHistory();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class INET_API Hcf : public ICoordinationFunction, public IFrameSequenceHandler:
107107
virtual void initialize(int stage) override;
108108
virtual void forEachChild(cVisitor *v) override;
109109
virtual void handleMessage(cMessage *msg) override;
110-
virtual void updateDisplayString() const;
110+
virtual void refreshDisplay() const;
111111

112112
void startFrameSequence(AccessCategory ac);
113113
void handleInternalCollision(std::vector<Edcaf *> internallyCollidedEdcafs);

‎src/inet/linklayer/ieee80211/mac/queue/InProgressFrames.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void InProgressFrames::initialize(int stage)
2626
}
2727
}
2828

29-
void InProgressFrames::updateDisplayString() const
29+
void InProgressFrames::refreshDisplay() const
3030
{
3131
std::string text = std::to_string(inProgressFrames.size()) + " packets";
3232
getDisplayString().setTagArg("t", 0, text.c_str());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class INET_API InProgressFrames : public cSimpleModule
3232

3333
protected:
3434
virtual void initialize(int stage) override;
35-
virtual void updateDisplayString() const;
35+
virtual void refreshDisplay() const;
3636

3737
void ensureHasFrameToTransmit();
3838
bool hasEligibleFrameToTransmit();

‎src/inet/linklayer/ieee80211/mac/ratecontrol/AarfRateControl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void AarfRateControl::handleMessage(cMessage *msg)
4040
throw cRuntimeError("This module doesn't handle self messages");
4141
}
4242

43-
void AarfRateControl::updateDisplayString() const
43+
void AarfRateControl::refreshDisplay() const
4444
{
4545
getDisplayString().setTagArg("t", 0, currentMode->getName());
4646
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class INET_API AarfRateControl : public RateControlBase
3838
virtual void resetIncreaseThreshdold();
3939
virtual void resetTimer();
4040
virtual void increaseRateIfTimerIsExpired();
41-
virtual void updateDisplayString() const;
41+
virtual void refreshDisplay() const;
4242

4343
public:
4444
virtual const physicallayer::IIeee80211Mode *getRate() override;

‎src/inet/linklayer/ieee80211/mac/ratecontrol/OnoeRateControl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void OnoeRateControl::initialize(int stage)
2727
}
2828
}
2929

30-
void OnoeRateControl::updateDisplayString() const
30+
void OnoeRateControl::refreshDisplay() const
3131
{
3232
getDisplayString().setTagArg("t", 0, currentMode->getName());
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class INET_API OnoeRateControl : public RateControlBase
3737
virtual void computeMode();
3838
virtual void resetStatisticalVariables();
3939
virtual void computeModeIfTimerIsExpired();
40-
virtual void updateDisplayString() const;
40+
virtual void refreshDisplay() const;
4141

4242
public:
4343
virtual const physicallayer::IIeee80211Mode *getRate() override;

‎src/inet/linklayer/mrp/Mrp.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ void Mrp::refreshDisplay() const
19851985
}
19861986
}
19871987

1988-
void Mrp::updateDisplayString() const
1988+
void Mrp::refreshDisplay() const
19891989
{
19901990
if (getEnvir()->isGUI()) {
19911991
auto text = StringFormat::formatString(par("displayStringTextFormat"), this);

‎src/inet/linklayer/mrp/Mrp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class INET_API Mrp: public OperationalBase, public cListener, public StringForma
225225
virtual void clearFDB(simtime_t time);
226226
virtual void colorLink(NetworkInterface* ie, bool forwarding) const;
227227
virtual void refreshDisplay() const override;
228-
virtual void updateDisplayString() const;
228+
virtual void refreshDisplay() const;
229229
virtual std::string resolveDirective(char directive) const override;
230230
static const char *getMrpRoleName(MrpRole role, bool acronym);
231231
static const char *getNodeStateName(NodeState state);

‎src/inet/networklayer/common/NetworkInterface.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ void NetworkInterface::refreshDisplay() const
281281
{
282282
}
283283

284-
void NetworkInterface::updateDisplayString() const
284+
void NetworkInterface::refreshDisplay() const
285285
{
286286
if (getEnvir()->isGUI()) {
287287
auto text = StringFormat::formatString(par("displayStringTextFormat"), this);

‎src/inet/networklayer/common/NetworkInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class INET_API NetworkInterface : public queueing::PacketProcessorBase, public q
165165
virtual void initialize(int stage) override;
166166
virtual void handleParameterChange(const char *name) override;
167167
virtual void refreshDisplay() const override;
168-
virtual void updateDisplayString() const override;
168+
virtual void refreshDisplay() const override;
169169
virtual std::string resolveDirective(char directive) const override;
170170
virtual void receiveSignal(cComponent *source, simsignal_t signal, cObject *obj, cObject *details) override;
171171
virtual cGate *createGateObject(cGate::Type type) override {

‎src/inet/networklayer/ipv4/Ipv4NetworkLayer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void Ipv4NetworkLayer::refreshDisplay() const
1717
{
1818
}
1919

20-
void Ipv4NetworkLayer::updateDisplayString() const
20+
void Ipv4NetworkLayer::refreshDisplay() const
2121
{
2222
if (getEnvir()->isGUI()) {
2323
auto text = StringFormat::formatString(par("displayStringTextFormat"), this);

‎src/inet/networklayer/ipv4/Ipv4NetworkLayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class INET_API Ipv4NetworkLayer : public cModule, public StringFormat::IDirectiv
1717
{
1818
protected:
1919
virtual void refreshDisplay() const override;
20-
virtual void updateDisplayString() const;
20+
virtual void refreshDisplay() const;
2121
virtual std::string resolveDirective(char directive) const override;
2222
};
2323

‎src/inet/power/storage/SimpleCcBattery.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void SimpleCcBattery::refreshDisplay() const
3838
{
3939
}
4040

41-
void SimpleCcBattery::updateDisplayString() const
41+
void SimpleCcBattery::refreshDisplay() const
4242
{
4343
if (getEnvir()->isGUI()) {
4444
auto text = StringFormat::formatString(par("displayStringTextFormat"), this);

‎src/inet/power/storage/SimpleCcBattery.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class INET_API SimpleCcBattery : public CcEnergyStorageBase, public StringFormat
3636
protected:
3737
virtual void initialize(int stage) override;
3838
virtual void refreshDisplay() const override;
39-
virtual void updateDisplayString() const;
39+
virtual void refreshDisplay() const;
4040
virtual std::string resolveDirective(char directive) const override;
4141

4242
virtual void updateTotalCurrentConsumption() override;

‎src/inet/power/storage/SimpleEpEnergyStorage.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void SimpleEpEnergyStorage::refreshDisplay() const
5656
{
5757
}
5858

59-
void SimpleEpEnergyStorage::updateDisplayString() const
59+
void SimpleEpEnergyStorage::refreshDisplay() const
6060
{
6161
if (getEnvir()->isGUI()) {
6262
auto text = StringFormat::formatString(par("displayStringTextFormat"), this);

‎src/inet/power/storage/SimpleEpEnergyStorage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class INET_API SimpleEpEnergyStorage : public EpEnergyStorageBase, public String
7777
virtual void initialize(int stage) override;
7878
virtual void handleMessage(cMessage *message) override;
7979
virtual void refreshDisplay() const override;
80-
virtual void updateDisplayString() const;
80+
virtual void refreshDisplay() const;
8181
virtual std::string resolveDirective(char directive) const override;
8282

8383
virtual void updateTotalPowerConsumption() override;

‎src/inet/queueing/base/PacketGateBase.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ bool PacketGateBase::canPacketFlowThrough(Packet *packet) const
153153
return true;
154154
}
155155

156-
void PacketGateBase::updateDisplayString() const
156+
void PacketGateBase::refreshDisplay() const
157157
{
158-
PacketFlowBase::updateDisplayString();
158+
PacketFlowBase::refreshDisplay();
159159
getDisplayString().setTagArg("i", 1, isOpen_ ? "green" : "red");
160160
getDisplayString().setTagArg("i", 2, 50);
161161
}

‎src/inet/queueing/base/PacketGateBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class INET_API PacketGateBase : public PacketFlowBase, public TransparentProtoco
4040

4141
virtual bool canPacketFlowThrough(Packet *packet) const;
4242

43-
virtual void updateDisplayString() const override;
43+
virtual void refreshDisplay() const override;
4444

4545
public:
4646
virtual bool isOpen() const override { return isOpen_; }

‎src/inet/queueing/base/PacketProcessorBase.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ void PacketProcessorBase::dropPacket(Packet *packet, PacketDropReason reason, in
398398
delete packet;
399399
}
400400

401-
void PacketProcessorBase::updateDisplayString() const
401+
void PacketProcessorBase::refreshDisplay() const
402402
{
403403
if (getEnvir()->isGUI() && displayStringTextFormat != nullptr) {
404404
auto text = StringFormat::formatString(displayStringTextFormat, this);

‎src/inet/queueing/base/PacketProcessorBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class INET_API PacketProcessorBase : public cSimpleModule, public virtual IPacke
7373

7474
virtual void dropPacket(Packet *packet, PacketDropReason reason, int limit = -1);
7575

76-
virtual void updateDisplayString() const;
76+
virtual void refreshDisplay() const;
7777

7878
public:
7979
virtual bool supportsPacketSending(const cGate *gate) const override { return true; }

0 commit comments

Comments
 (0)