Don't use qDebug().noquote() for now (bug #1169)

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index ecdacdefa6ec09d53c6a1e8b343b40e6f661e96b..f1995dcae4f48c03b65f5efb6646fdf9dd24368f 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -158,7 +158,8 @@ void DecodeSignal::reset_decode(bool shutting_down)
 
        if (!error_message_.isEmpty()) {
                error_message_ = QString();
 
        if (!error_message_.isEmpty()) {
                error_message_ = QString();

-               qDebug().noquote().nospace() << name() << ": Error cleared";
+               // TODO Emulate noquote()
+               qDebug().nospace() << name() << ": Error cleared";

        }
 
        decode_reset();
        }
 
        decode_reset();


@@ -588,7 +589,8 @@ void DecodeSignal::restore_settings(QSettings &settings)
 void DecodeSignal::set_error_message(QString msg)
 {
        error_message_ = msg;
 void DecodeSignal::set_error_message(QString msg)
 {
        error_message_ = msg;

-       qDebug().noquote().nospace() << name() << ": " << msg;
+       // TODO Emulate noquote()
+       qDebug().nospace() << name() << ": " << msg;

 }
 
 uint32_t DecodeSignal::get_input_segment_count() const
 }
 
 uint32_t DecodeSignal::get_input_segment_count() const

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 9f20b2694968942a2a0e1da9a38dd920707f4d1a..c77327c3d1b6b18bd1c1255139b0a6b19323a7d9 100644 (file)
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -107,7 +107,8 @@ void GlobalSettings::setValue(const QString &key, const QVariant &value)
 
        QSettings::setValue(key, value);
 
 
        QSettings::setValue(key, value);
 

-       qDebug().noquote() << "Setting" << key << "changed to" << value;
+       // TODO Emulate noquote()
+       qDebug() << "Setting" << key << "changed to" << value;

 
        // Call all registered callbacks
        for (GlobalSettingsInterface *cb : callbacks_)
 
        // Call all registered callbacks
        for (GlobalSettingsInterface *cb : callbacks_)

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 4fe483ef3abafda58104052dc9f6d3a581eb74ac..25377024278ca8f7475a572c3d9867d7a64efdb8 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -94,7 +94,8 @@ MainWindow::~MainWindow()
 
 void MainWindow::show_session_error(const QString text, const QString info_text)
 {
 
 void MainWindow::show_session_error(const QString text, const QString info_text)
 {

-       qDebug().noquote() << "Notifying user of session error:" << info_text;
+       // TODO Emulate noquote()
+       qDebug() << "Notifying user of session error:" << info_text;

 
        QMessageBox msg;
        msg.setText(text);
 
        QMessageBox msg;
        msg.setText(text);

diff --git a/pv/session.cpp b/pv/session.cpp
index 87e9b3a5e1060223d27a67f0a17cab94db6e9fcc..80dad66ee929ef36974da0573cb982f3843b4e06 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -301,7 +301,8 @@ void Session::restore_settings(QSettings &settings)
                        set_device(device);
 
                        start_capture([](QString infoMessage) {
                        set_device(device);
 
                        start_capture([](QString infoMessage) {

-                               qDebug().noquote() << "Session error:" << infoMessage; });
+                               // TODO Emulate noquote()
+                               qDebug() << "Session error:" << infoMessage; });

 
                        set_name(QFileInfo(filename).fileName());
                }
 
                        set_name(QFileInfo(filename).fileName());
                }