From 6507190af960eae314c426ffba84ebc70adf7a3a Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 1 Nov 2014 13:59:27 -0700 Subject: [PATCH] Use org/appname from QApplication for Settings --- src/comm/SerialLink.cc | 4 ++-- src/ui/configuration/terminalconsole.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc index d499e4837..96f70c4c9 100644 --- a/src/comm/SerialLink.cc +++ b/src/comm/SerialLink.cc @@ -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() 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()); diff --git a/src/ui/configuration/terminalconsole.cpp b/src/ui/configuration/terminalconsole.cpp index f0b1127f4..a2dcdc416 100644 --- a/src/ui/configuration/terminalconsole.cpp +++ b/src/ui/configuration/terminalconsole.cpp @@ -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() 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); -- 2.22.0