aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/debugger/console
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2019-02-11 10:32:46 +0100
committerhjk <[email protected]>2019-02-15 15:12:02 +0000
commitec6b38dea0a9c7f5b2b45dff6cbb2b1479f44878 (patch)
tree00a9e1596699485c20f34ba8300981f4c726d4ed /src/plugins/debugger/console
parent6eac37a7d93396f03f00f00135e06a82cdda1cf4 (diff)
Fix Qt 5.13 deprecation warning about QFontMetrics::width()
Replace by QFontMetrics::horizontalAdvance(), fixing: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Change-Id: I9991ffefe6e87e872dc35ba291d562e06b28ca64 Reviewed-by: Alessandro Portale <[email protected]>
Diffstat (limited to 'src/plugins/debugger/console')
-rw-r--r--src/plugins/debugger/console/consoleitemdelegate.cpp4
-rw-r--r--src/plugins/debugger/console/consoleitemmodel.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/debugger/console/consoleitemdelegate.cpp b/src/plugins/debugger/console/consoleitemdelegate.cpp
index 265ee6ce179..2196d7a260a 100644
--- a/src/plugins/debugger/console/consoleitemdelegate.cpp
+++ b/src/plugins/debugger/console/consoleitemdelegate.cpp
@@ -186,7 +186,7 @@ void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
const int pos = file.lastIndexOf('/');
if (pos != -1)
file = file.mid(pos +1);
- const int realFileWidth = fm.width(file);
+ const int realFileWidth = fm.horizontalAdvance(file);
painter->setClipRect(positions.fileArea());
painter->drawText(positions.fileAreaLeft(), positions.adjustedTop() + fm.ascent(),
file);
@@ -203,7 +203,7 @@ void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
// Paint LineArea
QString lineText = index.data(ConsoleItem::LineRole).toString();
painter->setClipRect(positions.lineArea());
- const int realLineWidth = fm.width(lineText);
+ const int realLineWidth = fm.horizontalAdvance(lineText);
painter->drawText(positions.lineAreaRight() - realLineWidth,
positions.adjustedTop() + fm.ascent(), lineText);
}
diff --git a/src/plugins/debugger/console/consoleitemmodel.cpp b/src/plugins/debugger/console/consoleitemmodel.cpp
index 525aca0dc0d..aa31132956f 100644
--- a/src/plugins/debugger/console/consoleitemmodel.cpp
+++ b/src/plugins/debugger/console/consoleitemmodel.cpp
@@ -92,7 +92,7 @@ int ConsoleItemModel::sizeOfFile(const QFont &font)
filename = filename.mid(pos + 1);
QFontMetrics fm(font);
- m_maxSizeOfFileName = qMax(m_maxSizeOfFileName, fm.width(filename));
+ m_maxSizeOfFileName = qMax(m_maxSizeOfFileName, fm.horizontalAdvance(filename));
return m_maxSizeOfFileName;
}
@@ -100,7 +100,7 @@ int ConsoleItemModel::sizeOfFile(const QFont &font)
int ConsoleItemModel::sizeOfLineNumber(const QFont &font)
{
QFontMetrics fm(font);
- return fm.width("88888");
+ return fm.horizontalAdvance("88888");
}
} // Internal