piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Warnings fixes on recent compilers

Browse Source
This commit is contained in:
Bertrand Songis
2019-08-12 11:29:34 +02:00
parent b9d64c2ca1
commit 08290d76fb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/joystickdialog.cpp
+3 -3
View File
@@ -45,14 +45,14 @@ joystickDialog::joystickDialog(QWidget *parent, int stick) :
}; };
memcpy(jscal, jscaltmp, sizeof (jscal)); memcpy(jscal, jscaltmp, sizeof (jscal));
foreach(QComboBox *cb, findChildren<QComboBox *>(QRegExp("jsmapCB_[0-9]+"))) { foreach(QComboBox *cb, findChildren<QComboBox *>(QRegularExpression("jsmapCB_[0-9]+"))) {
populateSourceCombo(cb); populateSourceCombo(cb);
sticks[cb->property("channel").toUInt()] = cb; sticks[cb->property("channel").toUInt()] = cb;
} }
foreach(QCheckBox *ib, findChildren<QCheckBox *>(QRegExp("ChInv_[0-9]+"))) { foreach(QCheckBox *ib, findChildren<QCheckBox *>(QRegularExpression("ChInv_[0-9]+"))) {
invert[ib->property("channel").toUInt()] = ib; invert[ib->property("channel").toUInt()] = ib;
} }
foreach(QSlider *sl, findChildren<QSlider *>(QRegExp("Ch_[0-9]+"))) { foreach(QSlider *sl, findChildren<QSlider *>(QRegularExpression("Ch_[0-9]+"))) {
sliders[sl->property("channel").toUInt()] = sl; sliders[sl->property("channel").toUInt()] = sl;
} }
companion/src/simulation/simulatorinterface.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ void SimulatorLoader::registerSimulators()
path.truncate(path.lastIndexOf('\\')); path.truncate(path.lastIndexOf('\\'));
dir.setPath(path); dir.setPath(path);
#else #else
dir = SIMULATOR_LIB_SEARCH_PATH; dir.setPath(SIMULATOR_LIB_SEARCH_PATH);
#endif #endif
registerSimulators(dir); registerSimulators(dir);
} }
companion/src/simulation/widgets/virtualjoystickwidget.cpp
+1 -1
View File
@@ -444,7 +444,7 @@ QLayout *VirtualJoystickWidget::createNodeValueLayout(QChar type, QLabel *& valL
val->setObjectName(QString("val_%1").arg(type)); val->setObjectName(QString("val_%1").arg(type));
val->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); val->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
val->setAlignment(Qt::AlignCenter); val->setAlignment(Qt::AlignCenter);
val->setMinimumWidth(val->fontMetrics().width("-100 ")); val->setMinimumWidth(val->fontMetrics().horizontalAdvance("-100 "));
QVBoxLayout * layout = new QVBoxLayout(); QVBoxLayout * layout = new QVBoxLayout();
layout->setContentsMargins(2, 2, 2, 2); layout->setContentsMargins(2, 2, 2, 2);
layout->setSpacing(2); layout->setSpacing(2);