Fix clazy warnings regarding range-for references

[pulseview.git] / pv / application.cpp

diff --git a/pv/application.cpp b/pv/application.cpp
index 4d0dde78f94d2c218d9c7ae7d5eefb95e8e46f25..5a6e28a1da996034aa24218df7ef2d66eb425543 100644 (file)
--- a/pv/application.cpp
+++ b/pv/application.cpp
@@ -115,29 +115,29 @@ void Application::collect_version_info(shared_ptr<sigrok::Context> context)
        // Firmware paths
        l_orig = sr_resourcepaths_get(SR_RESOURCE_FIRMWARE);
        for (GSList *l = l_orig; l; l = l->next)
-               fw_path_list_.push_back(QString((char*)l->data));
+               fw_path_list_.emplace_back((char*)l->data);
        g_slist_free_full(l_orig, g_free);
 
        // PD paths
 #ifdef ENABLE_DECODE
        l_orig = srd_searchpaths_get();
        for (GSList *l = l_orig; l; l = l->next)
-               pd_path_list_.push_back(QString((char*)l->data));
+               pd_path_list_.emplace_back((char*)l->data);
        g_slist_free_full(l_orig, g_free);
 #endif
 
        // Device drivers
-       for (auto entry : context->drivers())
+       for (auto& entry : context->drivers())
                driver_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
                        QString::fromUtf8(entry.second->long_name().c_str()));
 
        // Input formats
-       for (auto entry : context->input_formats())
+       for (auto& entry : context->input_formats())
                input_format_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
                        QString::fromUtf8(entry.second->description().c_str()));
 
        // Output formats
-       for (auto entry : context->output_formats())
+       for (auto& entry : context->output_formats())
                output_format_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
                        QString::fromUtf8(entry.second->description().c_str()));
 
@@ -156,43 +156,41 @@ void Application::collect_version_info(shared_ptr<sigrok::Context> context)
 
 void Application::print_version_info()
 {
-       cout << PV_TITLE << PV_VERSION_STRING << endl;
+       cout << PV_TITLE << " " << PV_VERSION_STRING << endl;
 
        cout << endl << "Libraries and features:" << endl;
-       for (pair<QString, QString> &entry : version_info_)
+       for (pair<QString, QString>& entry : version_info_)
                cout << "  " << entry.first.toStdString() << " " << entry.second.toStdString() << endl;
 
        cout << endl << "Firmware search paths:" << endl;
-       for (QString &entry : fw_path_list_)
+       for (QString& entry : fw_path_list_)
                cout << "  " << entry.toStdString() << endl;
 
        cout << endl << "Protocol decoder search paths:" << endl;
-       for (QString &entry : pd_path_list_)
+       for (QString& entry : pd_path_list_)
                cout << "  " << entry.toStdString() << endl;
 
        cout << endl << "Supported hardware drivers:" << endl;
-       for (pair<QString, QString> &entry : driver_list_)
+       for (pair<QString, QString>& entry : driver_list_)
                cout << "  " << entry.first.leftJustified(21, ' ').toStdString() <<
                entry.second.toStdString() << endl;
 
        cout << endl << "Supported input formats:" << endl;
-       for (pair<QString, QString> &entry : input_format_list_)
+       for (pair<QString, QString>& entry : input_format_list_)
                cout << "  " << entry.first.leftJustified(21, ' ').toStdString() <<
                entry.second.toStdString() << endl;
 
        cout << endl << "Supported output formats:" << endl;
-       for (pair<QString, QString> &entry : output_format_list_)
+       for (pair<QString, QString>& entry : output_format_list_)
                cout << "  " << entry.first.leftJustified(21, ' ').toStdString() <<
                entry.second.toStdString() << endl;
 
 #ifdef ENABLE_DECODE
        cout << endl << "Supported protocol decoders:" << endl;
-       for (pair<QString, QString> &entry : pd_list_)
+       for (pair<QString, QString>& entry : pd_list_)
                cout << "  " << entry.first.leftJustified(21, ' ').toStdString() <<
                entry.second.toStdString() << endl;
 #endif
-
-       cout << endl;
 }
 
 vector< pair<QString, QString> > Application::get_version_info() const