Don't use QMessageBox::setInformativeText()

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index dfabc9a06797f0a080ae16069b16de70f0929280..960c38977ab98b49ef0d22061077cec2b2f64906 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -75,9 +75,6 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
        icon_green_(":/icons/status-green.svg"),
        icon_grey_(":/icons/status-grey.svg")
 {
-       qRegisterMetaType<util::Timestamp>("util::Timestamp");
-       qRegisterMetaType<uint64_t>("uint64_t");
-
        GlobalSettings::add_change_handler(this);
 
        setup_ui();
@@ -98,8 +95,7 @@ void MainWindow::show_session_error(const QString text, const QString info_text)
        qDebug() << "Notifying user of session error:" << info_text;
 
        QMessageBox msg;
-       msg.setText(text);
-       msg.setInformativeText(info_text);
+       msg.setText(text + "\n\n" + info_text);
        msg.setStandardButtons(QMessageBox::Ok);
        msg.setIcon(QMessageBox::Warning);
        msg.exec();
@@ -172,8 +168,8 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
                QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
        QAbstractButton *close_btn =
-               dock->findChildren<QAbstractButton*>("qt_dockwidget_closebutton")
-                       .front();  // clazy:exclude=detaching-temporary
+               dock->findChildren<QAbstractButton*>("qt_dockwidget_closebutton")  // clazy:exclude=detaching-temporary
+                       .front();
 
        connect(close_btn, SIGNAL(clicked(bool)),
                this, SLOT(on_view_close_clicked()));
@@ -313,8 +309,8 @@ void MainWindow::remove_session(shared_ptr<Session> session)
                // When there are no more tabs, the height of the QTabWidget
                // drops to zero. We must prevent this to keep the static
                // widgets visible
-               for (QWidget *w : static_tab_widget_->findChildren<QWidget*>())
-                       w->setMinimumHeight(h);  // clazy:exclude=range-loop
+               for (QWidget *w : static_tab_widget_->findChildren<QWidget*>())  // clazy:exclude=range-loop
+                       w->setMinimumHeight(h);
 
                int margin = static_tab_widget_->layout()->contentsMargins().bottom();
                static_tab_widget_->setMinimumHeight(h + 2 * margin);