Warning fixing (#35)

* Bumped Cpp standard to 20 for warning fix, required adding `this` in lambda captures

* Removed duplicate verbose flag

---------

Co-authored-by: Mael FEURGARD <mael.feurgard@laas.fr>

Author: spacewolfXfr

CMakeLists.txt

@@ -6,7 +6,7 @@ include(GNUInstallDirs)
 
 set(CXX_EXTRA_FLAGS "-Wall -Wextra -fno-sized-deallocation")
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${CXX_EXTRA_FLAGS}")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CXX_EXTRA_FLAGS} -Werror")
 

docs/source/developer_guide/widgets.rst

@@ -79,7 +79,7 @@ Finally, you can bind a callback to any message with the PprzDispatcher's ``bind
 .. code-block:: cpp
 
     pprzApp()->toolbox()->pprzDispatcher()->bind("INTRUDER", this,
-            [=](QString sender, pprzlink::Message msg) {
+            [=,this](QString sender, pprzlink::Message msg) {
                 onIntruder(sender, msg);
             });
 

src/app_settings.cpp

@@ -151,7 +151,7 @@ SettingsEditor::SettingsEditor(bool standalone, QWidget* parent): QDialog(parent
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
     lay->addWidget(buttonBox);
 
-    connect(buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, [=](){
+    connect(buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, [this](){
         for(auto &cb:callbacks) {
             cb();
         }
@@ -165,7 +165,7 @@ SettingsEditor::SettingsEditor(bool standalone, QWidget* parent): QDialog(parent
         }
     });
 
-    connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, [=](){
+    connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, [=,this](){
         reject();
         if(standalone) {
             qDebug() << "Restarting application...";
@@ -190,7 +190,7 @@ std::function<void()> SettingsEditor::addSetting(QString name, QString key, QWid
         auto edit = new QLineEdit(settings.value(key).toString(), w);
         gl->addWidget(edit, r, 1);
 
-        auto cb = [=]() {
+        auto cb = [=,this]() {
           auto settings = getAppSettings();
           settings.setValue(key, edit->text());
         };
@@ -200,7 +200,7 @@ std::function<void()> SettingsEditor::addSetting(QString name, QString key, QWid
         auto edit = new QLineEdit(settings.value(key).toString(), w);
         gl->addWidget(edit, r, 1);
 
-        auto cb = [=]() {
+        auto cb = [=,this]() {
           auto settings = getAppSettings();
           settings.setValue(key, edit->text().toInt());
         };
@@ -210,7 +210,7 @@ std::function<void()> SettingsEditor::addSetting(QString name, QString key, QWid
         auto edit = new QLineEdit(settings.value(key).toString(), w);
         gl->addWidget(edit, r, 1);
 
-        auto cb = [=]() {
+        auto cb = [=,this]() {
           auto settings = getAppSettings();
           settings.setValue(key, edit->text().toDouble());
         };
@@ -223,15 +223,15 @@ std::function<void()> SettingsEditor::addSetting(QString name, QString key, QWid
         QToolButton* but = new QToolButton(w);
         but->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon));
         gl->addWidget(but, r, 2);
-        connect(but, &QToolButton::clicked, this, [=]() {
+        connect(but, &QToolButton::clicked, this, [=,this]() {
             auto dir = QFileDialog::getExistingDirectory(w, name, edit->text());
             qDebug() << dir;
             if(dir != "") {
                 edit->setText(dir);
             }
         });
 
-        auto cb = [=]() {
+        auto cb = [=,this]() {
           auto settings = getAppSettings();
           settings.setValue(key, edit->text());
         };
@@ -244,7 +244,7 @@ std::function<void()> SettingsEditor::addSetting(QString name, QString key, QWid
         QToolButton* but = new QToolButton(w);
         but->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon));
         gl->addWidget(but, r, 2);
-        connect(but, &QToolButton::clicked, this, [=]() {
+        connect(but, &QToolButton::clicked, this, [=,this]() {
             QFileInfo fi(edit->text());
             auto dir = QFileDialog::getOpenFileName(w, name, fi.absoluteDir().path());
             qDebug() << dir;
@@ -253,7 +253,7 @@ std::function<void()> SettingsEditor::addSetting(QString name, QString key, QWid
             }
         });
 
-        auto cb = [=]() {
+        auto cb = [=,this]() {
           auto settings = getAppSettings();
           settings.setValue(key, edit->text());
         };
@@ -266,7 +266,7 @@ std::function<void()> SettingsEditor::addSetting(QString name, QString key, QWid
         combo->setCurrentText(current);
         gl->addWidget(combo, r, 1);
 
-        auto cb = [=]() {
+        auto cb = [=,this]() {
             auto settings = getAppSettings();
             settings.setValue(key, combo->currentText());
         };

src/common/aircraft_status.cpp

@@ -9,7 +9,7 @@ AircraftStatus::AircraftStatus(QString ac_id, QObject *parent) : QObject(parent)
     watcher = new AircraftWatcher(ac_id, this);
 
     //listen for NAVIGATION_REF to update origin waypoint of fixedwings
-    PprzDispatcher::get()->bind("NAVIGATION_REF", this, [=](QString sender, pprzlink::Message msg) {
+    PprzDispatcher::get()->bind("NAVIGATION_REF", this, [=,this](QString sender, pprzlink::Message msg) {
         if(sender == ac_id) {
             int32_t utm_east, utm_north;
             uint8_t utm_zone;
@@ -27,7 +27,7 @@ AircraftStatus::AircraftStatus(QString ac_id, QObject *parent) : QObject(parent)
     });
 
     //listen for INS_REF to update origin waypoint of rotorcrafts
-    PprzDispatcher::get()->bind("INS_REF", this, [=](QString sender, pprzlink::Message msg) {
+    PprzDispatcher::get()->bind("INS_REF", this, [=,this](QString sender, pprzlink::Message msg) {
         if(sender == ac_id) {
 
             int32_t lat0, lon0, alt0;

src/common/setting.cpp

@@ -80,7 +80,7 @@ Setting::Setting(QDomElement setel, uint8_t& setting_no, QObject* parent) : QObj
 }
 
 float Setting::getAltUnitCoef(QString altUnit) {
-    auto coef_alt = [=](QString alt){
+    auto coef_alt = [=,this](QString alt){
         auto coef = Units::get()->getCoef(unit, alt);
         if(coef.has_value()) {
             return coef.value();

src/main.cpp

@@ -87,7 +87,6 @@ int main(int argc, char *argv[])
         parser.addVersionOption();
         parser.addOption({{"c", "configure"}, "Configure app settings."});
         parser.addOption({{"s", "silent"}, "Silent mode."});
-        parser.addOption({{"v", "verbose"}, "Verbose"});
         parser.addOption({{"f", "fpedit"}, "edit flight plan", "file"});
         parser.addOption({{"b", "bus"}, "Ivy bus", "bus"});
 #if defined(SPEECH_ENABLED)

src/pprzmain.cpp

@@ -64,21 +64,21 @@ void PprzMain::populate_menu() {
     auto file_menu = menu_bar->addMenu("&File");
 
     auto user_dir = file_menu->addAction("Open user directory");
-    connect(user_dir, &QAction::triggered, [=](){
+    connect(user_dir, &QAction::triggered, [=,this](){
         auto settings = getAppSettings();
         QString path = QDir::toNativeSeparators(appConfig()->value("USER_DATA_PATH").toString());
         QDesktopServices::openUrl(QUrl::fromLocalFile(path));
     });
 
     auto app_dir = file_menu->addAction("Open app directory");
-    connect(app_dir, &QAction::triggered, [=](){
+    connect(app_dir, &QAction::triggered, [=,this](){
         auto settings = getAppSettings();
         QString path = QDir::toNativeSeparators(appConfig()->value("APP_DATA_PATH").toString());
         QDesktopServices::openUrl(QUrl::fromLocalFile(path));
     });
 
     auto edit_settings = file_menu->addAction("Edit Settings");
-    connect(edit_settings, &QAction::triggered, [=](){
+    connect(edit_settings, &QAction::triggered, [=,this](){
         auto se = new SettingsEditor();
         se->open();
     });
@@ -96,7 +96,7 @@ void PprzMain::populate_menu() {
     map_track_ac->setChecked(false);
 
     auto open_flight_plan = file_menu->addAction("Open FlightPlans");
-    connect(open_flight_plan, &QAction::triggered, [=](){
+    connect(open_flight_plan, &QAction::triggered, [=,this](){
         auto settings = getAppSettings();
         auto pprz_home = appConfig()->value("PAPARAZZI_HOME").toString();
         auto files = QFileDialog::getOpenFileNames(this, "open fp", pprz_home + "/conf/flight_plans", "*.xml");
@@ -157,7 +157,7 @@ void PprzMain::populate_menu() {
             "<li><a %1 href=\"https://libzip.org/\">libzip</a></li>"
             "</ul>").arg(QCoreApplication::applicationVersion());
 
-    connect(about, &QAction::triggered, [=]() {
+    connect(about, &QAction::triggered, [=,this]() {
         QMessageBox::about(this,"About PprzGCS", about_txt);
 
     });

src/tools/AircraftManager.cpp

@@ -181,7 +181,7 @@ void ConfigData::setData(QDomDocument* doc, QString uri) {
         }
     } else if(uri.left(sepi) == "http") {
         auto netacc = new QNetworkAccessManager(this);
-        connect(netacc, &QNetworkAccessManager::finished, this, [=](QNetworkReply* reply) {
+        connect(netacc, &QNetworkAccessManager::finished, this, [=,this](QNetworkReply* reply) {
             auto data = reply->readAll();
             if(reply->error() == QNetworkReply::NetworkError::NoError) {
                 doc->setContent(data);

src/tools/dispatcher_ui.cpp

@@ -3,7 +3,7 @@
 DispatcherUi::DispatcherUi(PprzApplication* app, PprzToolbox* toolbox) : PprzTool(app, toolbox),
     selected_ac_id("")
 {
-    connect(this, &DispatcherUi::ac_selected, [=](QString ac_id){
+    connect(this, &DispatcherUi::ac_selected, [=,this](QString ac_id){
         selected_ac_id = ac_id;
     });
 

src/tools/grpcconnector.cpp

@@ -44,7 +44,7 @@ GRPCConnector::GRPCConnector(PprzApplication* app, PprzToolbox* toolbox) : PprzT
 void GRPCConnector::setToolbox(PprzToolbox* toolbox) {
     PprzTool::setToolbox(toolbox);
 
-    auto th = QThread::create([=] {
+    auto th = QThread::create([=,this] {
         this->runServer();
     });
     th->start();