aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc/DccFileTransfer.cpp
diff options
context:
space:
mode:
authorGravatar ctrlaltca2023-07-08 01:38:33 +0200
committerGravatar GitHub2023-07-08 01:38:33 +0200
commit28292170d8c02743cabfabba3a1623b8d71b9aa2 (patch)
tree03c7269f527a40a5b86863db7c111f2552afe46c /src/modules/dcc/DccFileTransfer.cpp
parentMerge branch 'bugfix/script-editor-out-of-range-exception' (diff)
downloadKVIrc-28292170d8c02743cabfabba3a1623b8d71b9aa2.tar.gz
KVIrc-28292170d8c02743cabfabba3a1623b8d71b9aa2.tar.bz2
KVIrc-28292170d8c02743cabfabba3a1623b8d71b9aa2.zip
Port to (and require) Qt 5.15. Drop KDE4 support, fix KDE5 (#2541)
* Port to (and require) Qt 5.15. Drop KDE4 support, implement KDE5 support where needed. --------- Co-authored-by: Fabio Bas <fabio.bas@officineinformatiche.net>
Diffstat (limited to 'src/modules/dcc/DccFileTransfer.cpp')
-rw-r--r--src/modules/dcc/DccFileTransfer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 34fa1ff34..7e02b672a 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -1676,8 +1676,8 @@ void DccFileTransfer::displayPaint(QPainter * p, int column, QRect rect)
QString szFrom = __tr2qs_ctx("From: ", "dcc");
QString szTo = __tr2qs_ctx("To: ", "dcc");
- int daW1 = fm.width(szFrom);
- int daW2 = fm.width(szTo);
+ int daW1 = fm.horizontalAdvance(szFrom);
+ int daW2 = fm.horizontalAdvance(szTo);
if(daW1 < daW2)
daW1 = daW2;
int iLineSpacing = fm.lineSpacing();
@@ -2010,7 +2010,7 @@ void DccFileTransfer::addToTransferLog(const QString & s)
{
QDateTime dt = QDateTime::currentDateTime();
QString ts;
- ts.sprintf("[%4d.%2d.%2d %2d:%2d:%2d] ", dt.date().year(), dt.date().month(), dt.date().day(), dt.time().hour(), dt.time().minute(), dt.time().second());
+ ts = QString::asprintf("[%4d.%2d.%2d %2d:%2d:%2d] ", dt.date().year(), dt.date().month(), dt.date().day(), dt.time().hour(), dt.time().minute(), dt.time().second());
m_szTransferLog += ts + s;
m_szTransferLog += "<br>";
}