Skip to content

Commit

Permalink
avoid using .getName() for new INDI properties (#2038)
Browse files Browse the repository at this point in the history
  • Loading branch information
naheedsa authored Apr 9, 2024
1 parent b08dc19 commit da3dabd
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 31 deletions.
10 changes: 5 additions & 5 deletions drivers/agent/agent_imager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,11 @@ bool Imager::updateProperties()
}
else
{
deleteProperty(StatusLP.getName());
deleteProperty(ProgressNP.getName());
deleteProperty(BatchSP.getName());
deleteProperty(DownloadNP.getName());
deleteProperty(FitsBP.getName());
deleteProperty(StatusLP);
deleteProperty(ProgressNP);
deleteProperty(BatchSP);
deleteProperty(DownloadNP);
deleteProperty(FitsBP);
}
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/agent/group.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ void Group::defineProperties()

void Group::deleteProperties()
{
imager->deleteProperty(GroupSettingsNP.getName());
imager->deleteProperty(GroupSettingsNP);
}
6 changes: 3 additions & 3 deletions drivers/ccd/ccd_simulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,10 @@ bool CCDSim::updateProperties()
else
{
if (HasCooler())
deleteProperty(CoolerSP.getName());
deleteProperty(CoolerSP);

deleteProperty(GainNP.getName());
deleteProperty(OffsetNP.getName());
deleteProperty(GainNP);
deleteProperty(OffsetNP);
deleteProperty(DirectoryTP);
deleteProperty(DirectorySP);
deleteProperty(ResolutionSP);
Expand Down
4 changes: 2 additions & 2 deletions drivers/ccd/guide_simulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ bool GuideSim::updateProperties()
else
{
if (HasCooler())
deleteProperty(CoolerSP.getName());
deleteProperty(CoolerSP);

deleteProperty(GainNP.getName());
deleteProperty(GainNP);
}

return true;
Expand Down
6 changes: 3 additions & 3 deletions drivers/focuser/focus_simulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ bool FocusSim::updateProperties()
}
else
{
deleteProperty(SeeingNP.getName());
deleteProperty(FWHMNP.getName());
deleteProperty(TemperatureNP.getName());
deleteProperty(SeeingNP);
deleteProperty(FWHMNP);
deleteProperty(TemperatureNP);
deleteProperty(DelayNP);
}

Expand Down
8 changes: 4 additions & 4 deletions drivers/rotator/integra.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,15 @@ bool Integra::updateProperties()
}
else
{
deleteProperty(MaxPositionNP.getName());
deleteProperty(MaxPositionNP);

// Focus
deleteProperty(SensorNP.getName());
deleteProperty(FindHomeSP.getName());
deleteProperty(SensorNP);
deleteProperty(FindHomeSP);

// Rotator
RI::updateProperties();
deleteProperty(RotatorAbsPosNP.getName());
deleteProperty(RotatorAbsPosNP);
}

return true;
Expand Down
10 changes: 5 additions & 5 deletions drivers/rotator/pyxis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ bool Pyxis::updateProperties()
}
else
{
deleteProperty(RotationRateNP.getName());
deleteProperty(SteppingSP.getName());
deleteProperty(PowerSP.getName());
deleteProperty(FirmwareTP.getName()) ;
deleteProperty(ModelTP.getName()) ;
deleteProperty(RotationRateNP);
deleteProperty(SteppingSP);
deleteProperty(PowerSP);
deleteProperty(FirmwareTP) ;
deleteProperty(ModelTP) ;
}

return true;
Expand Down
2 changes: 1 addition & 1 deletion drivers/telescope/telescope_simulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ bool ScopeSim::updateProperties()
{
deleteProperty(GuideNSNP.name);
deleteProperty(GuideWENP.name);
deleteProperty(GuideRateNP.getName());
deleteProperty(GuideRateNP);
deleteProperty(HomeSP);
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/weather/mbox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ bool MBox::updateProperties()
}
else
{
deleteProperty(CalibrationNP.getName());
deleteProperty(ResetSP.getName());
deleteProperty(FirmwareTP.getName());
deleteProperty(CalibrationNP);
deleteProperty(ResetSP);
deleteProperty(FirmwareTP);
}

return true;
Expand Down
2 changes: 1 addition & 1 deletion drivers/weather/weather_safety_proxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ bool WeatherSafetyProxy::updateProperties()
}
else
{
deleteProperty(reasonsTP.getName());
deleteProperty(reasonsTP);
}

return true;
Expand Down
4 changes: 2 additions & 2 deletions drivers/weather/weathermeta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ bool WeatherMeta::updateProperties()
}
else
{
deleteProperty(StationLP.getName());
deleteProperty(UpdatePeriodNP.getName());
deleteProperty(StationLP);
deleteProperty(UpdatePeriodNP);
}
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/weather/weathersimulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ bool WeatherSimulator::updateProperties()
if (isConnected())
defineProperty(ControlWeatherNP);
else
deleteProperty(ControlWeatherNP.getName());
deleteProperty(ControlWeatherNP);

return true;
}
Expand Down

0 comments on commit da3dabd

Please sign in to comment.