summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_protocol_fg
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-01-05 21:45:31 +0100
committerStanislaw Halik <sthalik@misaki.pl>2015-01-05 21:45:31 +0100
commit3272306484ee358ee00c1926d88439814e7276bc (patch)
treee6c0e053a3c255859576d2ebd116174d60c23b7e /ftnoir_protocol_fg
parent7b81b27f70cb5169bbd61de7cc6628dac5620cc8 (diff)
remove needless settings reload in dialogs
Options handling was fixed to pass the same bundle to all consumers. There's no need to reload it explicitly anymore.
Diffstat (limited to 'ftnoir_protocol_fg')
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg.cpp5
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg.h10
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp4
3 files changed, 3 insertions, 16 deletions
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
index b3243f62..85dd4684 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
@@ -30,11 +30,6 @@
// For Todd and Arda Kutlu
-void FTNoIR_Protocol::reloadSettings()
-{
- s.b->reload();
-}
-
void FTNoIR_Protocol::pose(const double* headpose) {
FlightData.x = headpose[TX] * 1e-2;
FlightData.y = headpose[TY] * 1e-2;
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.h b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
index d35b9fbd..36768fd5 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.h
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
@@ -57,7 +57,6 @@ public:
QString game_name() {
return "FlightGear";
}
- void reloadSettings();
private:
settings s;
TFlightGearData FlightData;
@@ -70,15 +69,10 @@ class FGControls: public IProtocolDialog
Q_OBJECT
public:
FGControls();
- void register_protocol(IProtocol *protocol) {
- theProtocol = (FTNoIR_Protocol *) protocol; // Accept the pointer to the Protocol
- }
- void unregister_protocol() {
- theProtocol = NULL; // Reset the pointer
- }
+ void register_protocol(IProtocol *) {}
+ void unregister_protocol() {}
private:
Ui::UICFGControls ui;
- FTNoIR_Protocol *theProtocol;
settings s;
private slots:
void doOK();
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
index 041e9961..d15c9466 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
@@ -37,7 +37,7 @@
//
// Constructor for server-settings-dialog
//
-FGControls::FGControls() : theProtocol(nullptr)
+FGControls::FGControls()
{
ui.setupUi( this );
@@ -54,8 +54,6 @@ FGControls::FGControls() : theProtocol(nullptr)
void FGControls::doOK() {
s.b->save();
this->close();
- if (theProtocol)
- theProtocol->reloadSettings();
}
void FGControls::doCancel() {