Browse Source

Use org/appname from QApplication for Settings

QGC4.4
Don Gagne 11 years ago
parent
commit
6507190af9
  1. 4
      src/comm/SerialLink.cc
  2. 4
      src/ui/configuration/terminalconsole.cpp

4
src/comm/SerialLink.cc

@ -139,7 +139,7 @@ bool SerialLink::isBootloader() @@ -139,7 +139,7 @@ bool SerialLink::isBootloader()
void SerialLink::loadSettings()
{
// Load defaults from settings
QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
QSettings settings;
settings.sync();
if (settings.contains("SERIALLINK_COMM_PORT"))
{
@ -157,7 +157,7 @@ void SerialLink::loadSettings() @@ -157,7 +157,7 @@ void SerialLink::loadSettings()
void SerialLink::writeSettings()
{
// Store settings
QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
QSettings settings;
settings.setValue("SERIALLINK_COMM_PORT", getPortName());
settings.setValue("SERIALLINK_COMM_BAUD", getBaudRateType());
settings.setValue("SERIALLINK_COMM_PARITY", getParityType());

4
src/ui/configuration/terminalconsole.cpp

@ -266,7 +266,7 @@ void TerminalConsole::setLink(int index) @@ -266,7 +266,7 @@ void TerminalConsole::setLink(int index)
void TerminalConsole::loadSettings()
{
// Load defaults from settings
QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
QSettings settings;
settings.sync();
if (settings.contains("TERMINALCONSOLE_COMM_PORT"))
{
@ -288,7 +288,7 @@ void TerminalConsole::loadSettings() @@ -288,7 +288,7 @@ void TerminalConsole::loadSettings()
void TerminalConsole::writeSettings()
{
// Store settings
QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
QSettings settings;
settings.setValue("TERMINALCONSOLE_COMM_PORT", m_settings.name);
settings.setValue("TERMINALCONSOLE_COMM_BAUD", m_settings.baudRate);
settings.setValue("TERMINALCONSOLE_COMM_PARITY", m_settings.parity);

Loading…
Cancel
Save