Couple of APIs used by KernelShark have been marked as deprecated
in the recent version of Qt. Fix all compilation warnings caused
by the usage of these deprecated APIs.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@xxxxxxxxx>
---
src/KsTraceGraph.cpp | 9 +++++++--
src/KsWidgetsLib.cpp | 14 +++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/KsTraceGraph.cpp b/src/KsTraceGraph.cpp
index fd9cfac..1e976df 100644
--- a/src/KsTraceGraph.cpp
+++ b/src/KsTraceGraph.cpp
@@ -327,13 +327,18 @@ void KsTraceGraph::_setPointerInfo(size_t i)
QString aux(lanMakeString(kshark_get_aux_info(e)));
QString info(lanMakeString(kshark_get_info(e)));
QString comm(lanMakeString(kshark_get_task(e)));
- QString pointer, elidedText;
+ QString elidedText;
int labelWidth;
uint64_t sec, usec;
+ char *pointer;
kshark_convert_nano(e->ts, &sec, &usec);
- pointer.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec);
+ labelWidth = asprintf(&pointer, "%" PRIu64 ".%06" PRIu64 "", sec, usec);
+ if (labelWidth <= 0)
+ return;
+
_labelP2.setText(pointer);
+ free(pointer);
comm.append("-");
comm.append(QString("%1").arg(kshark_get_pid(e)));
diff --git a/src/KsWidgetsLib.cpp b/src/KsWidgetsLib.cpp
index 4ec6033..e30bf27 100644
--- a/src/KsWidgetsLib.cpp
+++ b/src/KsWidgetsLib.cpp
@@ -926,9 +926,9 @@ KsCPUCheckBoxWidget::KsCPUCheckBoxWidget(kshark_data_stream *stream, QWidget *pa
cpuItem->setText(0, " ");
cpuItem->setText(1, QString("CPU %1").arg(i));
cpuItem->setCheckState(0, Qt::Checked);
- cpuItem->setBackgroundColor(0, QColor(colors[i].r(),
- colors[i].g(),
- colors[i].b()));
+ cpuItem->setBackground(0, QColor(colors[i].r(),
+ colors[i].g(),
+ colors[i].b()));
_tree.addTopLevelItem(cpuItem);
_id[i] = i;
_cb[i] = cpuItem;
@@ -1115,12 +1115,12 @@ KsTasksCheckBoxWidget::KsTasksCheckBoxWidget(kshark_data_stream *stream,
comItem = new QTableWidgetItem(tr(comm));
- pidItem->setBackgroundColor(QColor(colors[pid].r(),
- colors[pid].g(),
- colors[pid].b()));
+ pidItem->setBackground(QColor(colors[pid].r(),
+ colors[pid].g(),
+ colors[pid].b()));
if (_id[i] == 0)
- pidItem->setTextColor(Qt::white);
+ pidItem->setForeground(Qt::white);
_table.setItem(i, 2, comItem);
}
--
2.27.0
|