projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMakeLists.txt: Set CMake policy CMP0054 to NEW.
[pulseview.git]
/
pv
/
logging.cpp
diff --git
a/pv/logging.cpp
b/pv/logging.cpp
index ea0798286e6135dc8a57ab0b2b46669d06f28b93..1d4eb7c9b92ee29b6a806fa8c9464fa05765d81a 100644
(file)
--- a/
pv/logging.cpp
+++ b/
pv/logging.cpp
@@
-55,9
+55,9
@@
void Logging::init()
buffer_.reserve(buffer_size_);
qInstallMessageHandler(log_pv);
buffer_.reserve(buffer_size_);
qInstallMessageHandler(log_pv);
- sr_log_callback_set(log_
libsigrok
, nullptr);
+ sr_log_callback_set(log_
sr
, nullptr);
#ifdef ENABLE_DECODE
#ifdef ENABLE_DECODE
- srd_log_callback_set(log_
lib
srd, nullptr);
+ srd_log_callback_set(log_srd, nullptr);
#endif
GlobalSettings::add_change_handler(this);
#endif
GlobalSettings::add_change_handler(this);
@@
-105,7
+105,7
@@
void Logging::log(const QString &text, int source)
s = QString("<font color=\"blue\">sr: %1</font>").arg(text);
break;
case LogSource_srd:
s = QString("<font color=\"blue\">sr: %1</font>").arg(text);
break;
case LogSource_srd:
- s = QString("<font color=\"
brown
\">srd: %1</font>").arg(text);
+ s = QString("<font color=\"
olive
\">srd: %1</font>").arg(text);
break;
default:
s = text;
break;
default:
s = text;
@@
-129,7
+129,7
@@
void Logging::log_pv(QtMsgType type, const QMessageLogContext &context, const QS
logging.log(msg, LogSource_pv);
}
logging.log(msg, LogSource_pv);
}
-int Logging::log_
libsigrok
(void *cb_data, int loglevel, const char *format, va_list args)
+int Logging::log_
sr
(void *cb_data, int loglevel, const char *format, va_list args)
{
(void)cb_data;
(void)loglevel;
{
(void)cb_data;
(void)loglevel;
@@
-142,7
+142,7
@@
int Logging::log_libsigrok(void *cb_data, int loglevel, const char *format, va_l
}
#ifdef ENABLE_DECODE
}
#ifdef ENABLE_DECODE
-int Logging::log_
lib
srd(void *cb_data, int loglevel, const char *format, va_list args)
+int Logging::log_srd(void *cb_data, int loglevel, const char *format, va_list args)
{
(void)cb_data;
(void)loglevel;
{
(void)cb_data;
(void)loglevel;