Skip to content

Q
qgroundcontrol
Unverified Commit b9f55000 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #7871 from patrickelectric/small_fixes 

Just my periodic small fixes
parents 601b8d09 9961769b
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
src/QGCApplication.cc
View file @ b9f55000
...@@ -665,8 +665,6 @@ void QGCApplication::checkTelemetrySavePathOnMainThread() ...@@ -665,8 +665,6 @@ void QGCApplication::checkTelemetrySavePathOnMainThread()
bool QGCApplication::_checkTelemetrySavePath(bool useMessageBox) bool QGCApplication::_checkTelemetrySavePath(bool useMessageBox)
{ {
QString errorTitle = tr("Telemetry save error");
QString saveDirPath = _toolbox->settingsManager()->appSettings()->telemetrySavePath(); QString saveDirPath = _toolbox->settingsManager()->appSettings()->telemetrySavePath();
if (saveDirPath.isEmpty()) { if (saveDirPath.isEmpty()) {
QString error = tr("Unable to save telemetry log. Application save directory is not set."); QString error = tr("Unable to save telemetry log. Application save directory is not set.");
......
src/QGCPalette.h
View file @ b9f55000
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
c << _colorInfoMap[Dark][ColorGroupDisabled][QStringLiteral(#NAME)].name(QColor::HexRgb); \ c << _colorInfoMap[Dark][ColorGroupDisabled][QStringLiteral(#NAME)].name(QColor::HexRgb); \
return c; \ return c; \
} \ } \
void SETNAME(QColor& color) { _colorInfoMap[_theme][_colorGroupEnabled ? ColorGroupEnabled : ColorGroupDisabled][QStringLiteral(#NAME)] = color; _signalPaletteChangeToAll(); } void SETNAME(const QColor& color) { _colorInfoMap[_theme][_colorGroupEnabled ? ColorGroupEnabled : ColorGroupDisabled][QStringLiteral(#NAME)] = color; _signalPaletteChangeToAll(); }
/*! /*!
QGCPalette is used in QML ui to expose color properties for the QGC palette. There are two QGCPalette is used in QML ui to expose color properties for the QGC palette. There are two
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment